From 1f9a375e329beb944d5b08397e37f5f451e21de8 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 4 May 2008 04:09:49 +0000 Subject: 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 --- bin/emerge | 6 ++++-- 1 file 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, -- cgit v1.2.3-1-g7c22