From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Raah9-0004k1-Vu for garchives@archives.gentoo.org; Tue, 13 Dec 2011 22:19:32 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E0DD21C093; Tue, 13 Dec 2011 22:19:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1B78321C093 for ; Tue, 13 Dec 2011 22:19:24 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8EE691B4005 for ; Tue, 13 Dec 2011 22:19:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id AD1A48004A for ; Tue, 13 Dec 2011 22:19:22 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <84dc400e53a715294615942021b8d0816e68e699.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/repository/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/repository/config.py X-VCS-Directories: pym/portage/repository/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 84dc400e53a715294615942021b8d0816e68e699 Date: Tue, 13 Dec 2011 22:19:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 14b5e328-a7a0-4421-88ea-46d3dea40e68 X-Archives-Hash: 0701dd49f3d233d76a1531ca16999040 commit: 84dc400e53a715294615942021b8d0816e68e699 Author: Zac Medico gentoo org> AuthorDate: Tue Dec 13 22:19:05 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Dec 13 22:19:05 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D84dc400e RepoConfigLoader: masters eclass override order Only append the current repo to eclass_locations if it's not there already. This allows masters to have more control over eclass override order, which may be useful for scenarios in which there is a plan to migrate eclasses to a master repo. Thanks to Brian Harring gentoo.org) for suggesting this behavior. --- pym/portage/repository/config.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/co= nfig.py index 4a8d866..0222253 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -531,7 +531,12 @@ class RepoConfigLoader(object): =20 eclass_locations =3D [] eclass_locations.extend(master_repo.location for master_repo in repo.= masters) - eclass_locations.append(repo.location) + # Only append the current repo to eclass_locations if it's not + # there already. This allows masters to have more control over + # eclass override order, which may be useful for scenarios in + # which there is a plan to migrate eclasses to a master repo. + if repo.location not in eclass_locations: + eclass_locations.append(repo.location) =20 if repo.eclass_overrides: for other_repo_name in repo.eclass_overrides: