diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-08-04 15:46:24 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-08-04 15:46:24 +0000 |
| commit | ccd5ad2d8f7867a2f28615bd2ab403c440ff2743 (patch) | |
| tree | 819b727d1bd6edb8dba03dd487c2229ed0ee6c74 | |
| parent | d75a216ede563f45e5097ce9d75f8b752b26e21a (diff) | |
| download | portage-ccd5ad2d8f7867a2f28615bd2ab403c440ff2743.tar.gz portage-ccd5ad2d8f7867a2f28615bd2ab403c440ff2743.tar.bz2 portage-ccd5ad2d8f7867a2f28615bd2ab403c440ff2743.zip | |
Remove code from bug #223447 which is now obsolete due to depclean using
the depgraph class.
svn path=/main/trunk/; revision=11326
| -rw-r--r-- | pym/_emerge/__init__.py | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 2282ad72a..1d86b0f14 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -5733,11 +5733,6 @@ class depgraph(object): pkgsettings = self.pkgsettings[myroot] final_db = self.mydbapi[myroot] - graph_complete_for_root = "complete" in self.myparams or \ - (myroot == self.target_root and \ - ("deep" in self.myparams or "empty" in self.myparams) and \ - not self._required_set_names.difference(self._sets)) - blocker_cache = BlockerCache(myroot, vardb) stale_cache = set(blocker_cache) for pkg in vardb: @@ -5761,18 +5756,11 @@ class depgraph(object): # # * KEYWORDS is not empty (not installed by old portage). # - # * The graph is complete and the package has not been - # pulled into the dependency graph. It's eligible for - # depclean, but depclean may fail to recognize it as - # such due to differences in visibility filtering which - # can lead to differences in || dep evaluation. - # TODO: Share visibility code to fix this inconsistency. if pkg in final_db: if pkg_in_graph and not visible(pkgsettings, pkg): self._masked_installed.add(pkg) - elif graph_complete_for_root and \ - pkgsettings._getMissingKeywords( + elif pkgsettings._getMissingKeywords( pkg.cpv, pkg.metadata) and \ pkg.metadata["KEYWORDS"].split() and \ not pkg_in_graph: |