diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-04 04:09:49 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-04 04:09:49 +0000 |
| commit | 1f9a375e329beb944d5b08397e37f5f451e21de8 (patch) | |
| tree | 0c61fda1b76def0a40b193498ff2cb4971c7500c /bin/emerge | |
| parent | 7daac192f408b60b87465874b60c729c237f9fcf (diff) | |
| download | portage-1f9a375e329beb944d5b08397e37f5f451e21de8.tar.gz portage-1f9a375e329beb944d5b08397e37f5f451e21de8.tar.bz2 portage-1f9a375e329beb944d5b08397e37f5f451e21de8.zip | |
Make favorites handling in depgraph.select_files() consistent with
SetArg handling when the "system" set is added along with "world".
svn path=/main/branches/2.1.2/; revision=10159
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index c8562d73d..1819c2601 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2594,15 +2594,17 @@ class depgraph(object): self._sets[s] = expanded_set args.append(SetArg(arg=x, set=expanded_set, root_config=root_config)) + myfavorites.append(x) if s == "world": # pull in the system set too s = "system" + x = SETPREFIX + s expanded_set = InternalPackageSet( initial_atoms=getSetAtoms(s)) self._sets[s] = expanded_set - args.append(SetArg(arg=SETPREFIX+s, set=expanded_set, + args.append(SetArg(arg=x, set=expanded_set, root_config=root_config)) - myfavorites.append(x) + myfavorites.append(x) continue if not is_valid_package_atom(x): portage.writemsg("\n\n!!! '%s' is not a valid package atom.\n" % x, |