diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-09 21:12:31 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-09 21:12:31 +0000 |
| commit | 85924d4d4464684b73bd33ce8eb310a89c66d4b6 (patch) | |
| tree | 8a9da79aa8736f546929cc886d52c38677df813e /bin | |
| parent | 2b4b77b67851e9a6de1852de6c080a55f97d0336 (diff) | |
| download | portage-85924d4d4464684b73bd33ce8eb310a89c66d4b6.tar.gz portage-85924d4d4464684b73bd33ce8eb310a89c66d4b6.tar.bz2 portage-85924d4d4464684b73bd33ce8eb310a89c66d4b6.zip | |
Pull in "system" as a separate set instead of mixing it with "world".
svn path=/main/branches/2.1.2/; revision=9784
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge index cbaf1cd1d..e038ab61f 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2334,12 +2334,17 @@ class depgraph(object): # sets (like if world contains system). expanded_set = InternalPackageSet( initial_atoms=getSetAtoms(s)) - if s == "world": - # add the system set to the world set - expanded_set.update(getSetAtoms("system")) self._sets[s] = expanded_set args.append(SetArg(arg=x, set=expanded_set, root_config=root_config)) + if s == "world": + # pull in the system set too + s = "system" + expanded_set = InternalPackageSet( + initial_atoms=getSetAtoms(s)) + self._sets[s] = expanded_set + args.append(SetArg(arg=SETPREFIX+s, set=expanded_set, + root_config=root_config)) #if not oneshot: # myfavorites.append(x) continue |