From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-61884-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1JsVXs-0007VD-G4
	for garchives@archives.gentoo.org; Sun, 04 May 2008 04:09:52 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id CDC2EE02C7;
	Sun,  4 May 2008 04:09:51 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id AB442E02C7
	for <gentoo-commits@lists.gentoo.org>; Sun,  4 May 2008 04:09:51 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id 4C89066F27
	for <gentoo-commits@lists.gentoo.org>; Sun,  4 May 2008 04:09:51 +0000 (UTC)
Received: from zmedico by stork.gentoo.org with local (Exim 4.68)
	(envelope-from <zmedico@stork.gentoo.org>)
	id 1JsVXq-00078c-89
	for gentoo-commits@lists.gentoo.org; Sun, 04 May 2008 04:09:50 +0000
To: gentoo-commits@lists.gentoo.org
From: "Zac Medico (zmedico)" <zmedico@gentoo.org>
Subject: [gentoo-commits] portage r10159 - main/branches/2.1.2/bin
X-VCS-Repository: portage
X-VCS-Revision: 10159
X-VCS-Files: main/branches/2.1.2/bin/emerge
X-VCS-Directories: main/branches/2.1.2/bin
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
Content-Type: text/plain; charset=UTF-8
Message-Id: <E1JsVXq-00078c-89@stork.gentoo.org>
Sender: Zac Medico <zmedico@stork.gentoo.org>
Date: Sun, 04 May 2008 04:09:50 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: ea6f41e9-7b9c-40e5-840d-76802b08c2ca
X-Archives-Hash: 556553a965bd986d0cc1518d829b0efa

Author: zmedico
Date: 2008-05-04 04:09:49 +0000 (Sun, 04 May 2008)
New Revision: 10159

Modified:
   main/branches/2.1.2/bin/emerge
Log:
Make favorites handling in depgraph.select_files() consistent with
SetArg handling when the "system" set is added along with "world".


Modified: main/branches/2.1.2/bin/emerge
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- main/branches/2.1.2/bin/emerge	2008-05-04 03:46:52 UTC (rev 10158)
+++ main/branches/2.1.2/bin/emerge	2008-05-04 04:09:49 UTC (rev 10159)
@@ -2594,15 +2594,17 @@
 					self._sets[s] =3D expanded_set
 					args.append(SetArg(arg=3Dx, set=3Dexpanded_set,
 						root_config=3Droot_config))
+					myfavorites.append(x)
 					if s =3D=3D "world":
 						# pull in the system set too
 						s =3D "system"
+						x =3D SETPREFIX + s
 						expanded_set =3D InternalPackageSet(
 							initial_atoms=3DgetSetAtoms(s))
 						self._sets[s] =3D expanded_set
-						args.append(SetArg(arg=3DSETPREFIX+s, set=3Dexpanded_set,
+						args.append(SetArg(arg=3Dx, set=3Dexpanded_set,
 							root_config=3Droot_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,

--=20
gentoo-commits@lists.gentoo.org mailing list