| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-31 23:53:14 +0000 (Mon, 31 Mar 2008) |
| 3 |
New Revision: 9657 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
When deps are forced to be satisfied by installed packages due to masking |
| 9 |
or unavailability, only tolerate it when the atom comes from either the |
| 10 |
system or world set since otherwise it's a good idea to bail so that the |
| 11 |
user can correct the problem. (trunk r9656) |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/branches/2.1.2/bin/emerge |
| 15 |
=================================================================== |
| 16 |
--- main/branches/2.1.2/bin/emerge 2008-03-31 23:47:50 UTC (rev 9656) |
| 17 |
+++ main/branches/2.1.2/bin/emerge 2008-03-31 23:53:14 UTC (rev 9657) |
| 18 |
@@ -2076,12 +2076,9 @@ |
| 19 |
return False, myfavorites |
| 20 |
|
| 21 |
if pkg.installed and "selective" not in self.myparams: |
| 22 |
- # Previous behavior was to bail out in this case, but |
| 23 |
- # since the dep is satisfied by the installed package, |
| 24 |
- # it's more friendly to continue building the graph |
| 25 |
- # and just show a warning message. |
| 26 |
self._unsatisfied_deps_for_display.append( |
| 27 |
((myroot, myatom), {"myparent":None})) |
| 28 |
+ return 0, myfavorites |
| 29 |
|
| 30 |
try: |
| 31 |
self.mysd = self.create(pkg, None) |
| 32 |
@@ -3104,7 +3101,9 @@ |
| 33 |
# Previous behavior was to bail out in this case, but |
| 34 |
# since the dep is satisfied by the installed package, |
| 35 |
# it's more friendly to continue building the graph |
| 36 |
- # and just show a warning message. |
| 37 |
+ # and just show a warning message. Therefore, only bail |
| 38 |
+ # out here if the atom is not from either the system or |
| 39 |
+ # world set. |
| 40 |
self._unsatisfied_deps_for_display.append( |
| 41 |
((myroot, mydep), {"myparent":None})) |
| 42 |
|
| 43 |
|
| 44 |
-- |
| 45 |
gentoo-commits@l.g.o mailing list |
Archives