From: Michael Schroeder <mls@suse.de>
Date: Fri, 13 Jan 2012 14:42:43 +0000 (+0100)
Subject: - remove legace vars now that they are no longer visible
X-Git-Tag: BASE-SuSE-Code-12_2-Branch~206
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=059146f96bdbc636569268c9c6f3e3deacc796db;p=platform%2Fupstream%2Flibsolv.git

- remove legace vars now that they are no longer visible
---

diff --git a/src/solver.c b/src/solver.c
index d11e63b..6f16416 100644
--- a/src/solver.c
+++ b/src/solver.c
@@ -2392,8 +2392,7 @@ solver_solve(Solver *solv, Queue *job)
 
   /* log solver options */
   POOL_DEBUG(SOLV_DEBUG_STATS, "solver started\n");
-  POOL_DEBUG(SOLV_DEBUG_STATS, "fixsystem=%d updatesystem=%d dosplitprovides=%d, noupdateprovide=%d noinfarchcheck=%d\n", solv->fixsystem, solv->updatesystem, solv->dosplitprovides, solv->noupdateprovide, solv->noinfarchcheck);
-  POOL_DEBUG(SOLV_DEBUG_STATS, "distupgrade=%d distupgrade_removeunsupported=%d\n", solv->distupgrade, solv->distupgrade_removeunsupported);
+  POOL_DEBUG(SOLV_DEBUG_STATS, "dosplitprovides=%d, noupdateprovide=%d noinfarchcheck=%d\n", solv->dosplitprovides, solv->noupdateprovide, solv->noinfarchcheck);
   POOL_DEBUG(SOLV_DEBUG_STATS, "allowuninstall=%d, allowdowngrade=%d, allowarchchange=%d, allowvendorchange=%d\n", solv->allowuninstall, solv->allowdowngrade, solv->allowarchchange, solv->allowvendorchange);
   POOL_DEBUG(SOLV_DEBUG_STATS, "promoteepoch=%d, allowselfconflicts=%d\n", pool->promoteepoch, pool->allowselfconflicts);
   POOL_DEBUG(SOLV_DEBUG_STATS, "obsoleteusesprovides=%d, implicitobsoleteusesprovides=%d, obsoleteusescolors=%d\n", pool->obsoleteusesprovides, pool->implicitobsoleteusesprovides, pool->obsoleteusescolors);
@@ -2410,12 +2409,6 @@ solver_solve(Solver *solv, Queue *job)
   queue_free(&solv->job);
   queue_init_clone(&solv->job, job);
 
-  /* initialize with legacy values */
-  solv->fixmap_all = solv->fixsystem;
-  solv->updatemap_all = solv->updatesystem;
-  solv->droporphanedmap_all = solv->distupgrade_removeunsupported;
-  solv->dupmap_all = solv->distupgrade;
-
   /*
    * create basic rule set of all involved packages
    * use addedmap bitmap to make sure we don't create rules twice
diff --git a/src/solver.h b/src/solver.h
index dd1c8a7..67eb413 100644
--- a/src/solver.h
+++ b/src/solver.h
@@ -182,22 +182,16 @@ struct _Solver {
    * Solver configuration
    *-------------------------------------------------------------------------------------------------------------*/
 
-  int fixsystem;			/* repair errors in rpm dependency graph */
   int allowdowngrade;			/* allow to downgrade installed solvable */
   int allowarchchange;			/* allow to change architecture of installed solvables */
   int allowvendorchange;		/* allow to change vendor of installed solvables */
   int allowuninstall;			/* allow removal of installed solvables */
-  int updatesystem;			/* update all packages to the newest version */
   int noupdateprovide;			/* true: update packages needs not to provide old package */
   int dosplitprovides;			/* true: consider legacy split provides */
   int dontinstallrecommended;		/* true: do not install recommended packages */
   int ignorealreadyrecommended;		/* true: ignore recommended packages that were already recommended by the installed packages */
   int dontshowinstalledrecommended;	/* true: do not show recommended packages that are already installed */
   
-  /* distupgrade also needs updatesystem and dosplitprovides */
-  int distupgrade;
-  int distupgrade_removeunsupported;
-
   int noinfarchcheck;			/* true: do not forbid inferior architectures */