1 |
Author: zmedico |
2 |
Date: 2008-03-31 23:47:50 +0000 (Mon, 31 Mar 2008) |
3 |
New Revision: 9656 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
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. |
12 |
|
13 |
|
14 |
Modified: main/trunk/pym/_emerge/__init__.py |
15 |
=================================================================== |
16 |
--- main/trunk/pym/_emerge/__init__.py 2008-03-31 23:14:42 UTC (rev 9655) |
17 |
+++ main/trunk/pym/_emerge/__init__.py 2008-03-31 23:47:50 UTC (rev 9656) |
18 |
@@ -2270,12 +2270,17 @@ |
19 |
self._missing_args.append((arg, atom)) |
20 |
continue |
21 |
if pkg.installed and "selective" not in self.myparams: |
22 |
+ self._unsatisfied_deps_for_display.append( |
23 |
+ ((myroot, atom), {})) |
24 |
# Previous behavior was to bail out in this case, but |
25 |
# since the dep is satisfied by the installed package, |
26 |
# it's more friendly to continue building the graph |
27 |
- # and just show a warning message. |
28 |
- self._unsatisfied_deps_for_display.append( |
29 |
- ((myroot, atom), {})) |
30 |
+ # and just show a warning message. Therefore, only bail |
31 |
+ # out here if the atom is not from either the system or |
32 |
+ # world set. |
33 |
+ if not (isinstance(arg, SetArg) and \ |
34 |
+ arg.name in ("system", "world")): |
35 |
+ return 0, myfavorites |
36 |
|
37 |
self._dep_stack.append( |
38 |
Dependency(atom=atom, onlydeps=onlydeps, root=myroot, parent=arg)) |
39 |
|
40 |
-- |
41 |
gentoo-commits@l.g.o mailing list |