| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-04 04:09:49 +0000 (Sun, 04 May 2008) |
| 3 |
New Revision: 10159 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Make favorites handling in depgraph.select_files() consistent with |
| 9 |
SetArg handling when the "system" set is added along with "world". |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-05-04 03:46:52 UTC (rev 10158) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-05-04 04:09:49 UTC (rev 10159) |
| 16 |
@@ -2594,15 +2594,17 @@ |
| 17 |
self._sets[s] = expanded_set |
| 18 |
args.append(SetArg(arg=x, set=expanded_set, |
| 19 |
root_config=root_config)) |
| 20 |
+ myfavorites.append(x) |
| 21 |
if s == "world": |
| 22 |
# pull in the system set too |
| 23 |
s = "system" |
| 24 |
+ x = SETPREFIX + s |
| 25 |
expanded_set = InternalPackageSet( |
| 26 |
initial_atoms=getSetAtoms(s)) |
| 27 |
self._sets[s] = expanded_set |
| 28 |
- args.append(SetArg(arg=SETPREFIX+s, set=expanded_set, |
| 29 |
+ args.append(SetArg(arg=x, set=expanded_set, |
| 30 |
root_config=root_config)) |
| 31 |
- myfavorites.append(x) |
| 32 |
+ myfavorites.append(x) |
| 33 |
continue |
| 34 |
if not is_valid_package_atom(x): |
| 35 |
portage.writemsg("\n\n!!! '%s' is not a valid package atom.\n" % x, |
| 36 |
|
| 37 |
-- |
| 38 |
gentoo-commits@l.g.o mailing list |
Archives