| 1 |
Author: zmedico |
| 2 |
Date: 2008-08-04 15:46:24 +0000 (Mon, 04 Aug 2008) |
| 3 |
New Revision: 11326 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Remove code from bug #223447 which is now obsolete due to depclean using |
| 9 |
the depgraph class. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-08-04 04:57:07 UTC (rev 11325) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-08-04 15:46:24 UTC (rev 11326) |
| 16 |
@@ -5733,11 +5733,6 @@ |
| 17 |
pkgsettings = self.pkgsettings[myroot] |
| 18 |
final_db = self.mydbapi[myroot] |
| 19 |
|
| 20 |
- graph_complete_for_root = "complete" in self.myparams or \ |
| 21 |
- (myroot == self.target_root and \ |
| 22 |
- ("deep" in self.myparams or "empty" in self.myparams) and \ |
| 23 |
- not self._required_set_names.difference(self._sets)) |
| 24 |
- |
| 25 |
blocker_cache = BlockerCache(myroot, vardb) |
| 26 |
stale_cache = set(blocker_cache) |
| 27 |
for pkg in vardb: |
| 28 |
@@ -5761,18 +5756,11 @@ |
| 29 |
# |
| 30 |
# * KEYWORDS is not empty (not installed by old portage). |
| 31 |
# |
| 32 |
- # * The graph is complete and the package has not been |
| 33 |
- # pulled into the dependency graph. It's eligible for |
| 34 |
- # depclean, but depclean may fail to recognize it as |
| 35 |
- # such due to differences in visibility filtering which |
| 36 |
- # can lead to differences in || dep evaluation. |
| 37 |
- # TODO: Share visibility code to fix this inconsistency. |
| 38 |
|
| 39 |
if pkg in final_db: |
| 40 |
if pkg_in_graph and not visible(pkgsettings, pkg): |
| 41 |
self._masked_installed.add(pkg) |
| 42 |
- elif graph_complete_for_root and \ |
| 43 |
- pkgsettings._getMissingKeywords( |
| 44 |
+ elif pkgsettings._getMissingKeywords( |
| 45 |
pkg.cpv, pkg.metadata) and \ |
| 46 |
pkg.metadata["KEYWORDS"].split() and \ |
| 47 |
not pkg_in_graph: |
Archives