| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-30 23:51:26 +0000 (Sun, 30 Mar 2008) |
| 3 |
New Revision: 9642 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Fix broken unsatisfied deps handling that triggers false positives in |
| 9 |
a case like virtual/pager which is both a new-style and old-style |
| 10 |
virtual. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/bin/emerge |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/bin/emerge 2008-03-30 22:29:42 UTC (rev 9641) |
| 16 |
+++ main/branches/2.1.2/bin/emerge 2008-03-30 23:51:26 UTC (rev 9642) |
| 17 |
@@ -1768,11 +1768,6 @@ |
| 18 |
# - multi-slot atoms listed in the world file |
| 19 |
# to prevent depclean from removing them |
| 20 |
|
| 21 |
- if arg and "selective" not in self.myparams: |
| 22 |
- self._unsatisfied_deps_for_display.append( |
| 23 |
- ((pkg.root, arg), {"myparent":myparent})) |
| 24 |
- return 0 |
| 25 |
- |
| 26 |
if not visible(pkgsettings, pkg.cpv, pkg.metadata, |
| 27 |
built=pkg.built, installed=pkg.installed): |
| 28 |
self._masked_installed.append((pkg, pkgsettings)) |
| 29 |
@@ -2084,6 +2079,12 @@ |
| 30 |
self._unsatisfied_deps_for_display.append( |
| 31 |
((myroot, myatom), {"myparent":None})) |
| 32 |
return False, myfavorites |
| 33 |
+ |
| 34 |
+ if pkg.installed and "selective" not in self.myparams: |
| 35 |
+ self._unsatisfied_deps_for_display.append( |
| 36 |
+ ((myroot, myatom), {"myparent":None})) |
| 37 |
+ return 0, myfavorites |
| 38 |
+ |
| 39 |
try: |
| 40 |
self.mysd = self.create(pkg, None) |
| 41 |
except portage_exception.MissingSignature, e: |
| 42 |
|
| 43 |
-- |
| 44 |
gentoo-commits@l.g.o mailing list |
Archives