diff options
Diffstat (limited to 'DistUpgrade/DistUpgradeControler.py')
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 71127092..9fa717fe 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -52,8 +52,6 @@ class DistUpgradeControler(object): # forced obsoletes self.forced_obsoletes = self.config.getlist("Distro","ForcedObsoletes") - # forced purges - self.forced_purges = self.config.getlist("Distro","ForcedPurges") def openCache(self): self.cache = MyCache(self._view.getOpCacheProgress()) @@ -251,9 +249,8 @@ class DistUpgradeControler(object): for pkg in self.config.getlist("Distro","MetaPkgs"): if self.cache.has_key(pkg) and self.cache[pkg].isInstalled: self.forced_obsoletes.extend(self.config.getlist(pkg,"ForcedObsoletes")) - self.forced_purges.extend(self.config.getlist(pkg,"ForcedPurges")) logging.debug("forced_obsoletes: %s", self.forced_obsoletes) - logging.debug("forced_purges: %s", self.forced_purges) + # mark packages that are now obsolete (and where not obsolete @@ -269,12 +266,6 @@ class DistUpgradeControler(object): logging.debug("'%s' scheduled for remove but not in remove_candiates, skipping", pkgname) logging.debug("Finish checking for obsolete pkgs") - # mark some stuff for purge - for pkg in self.forced_purges: - if self.cache.has_key(pkg): - logging.debug("Marking '%s' for purge", pkg) - self.cache._depcache.MarkDelete(self.cache[pkg]._pkg,True) - # get changes changes = self.cache.getChanges() logging.debug("The following packages are remove candidates: %s" % " ".join([pkg.name for pkg in changes])) |