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 <gentoo-commits+bounces-396096-garchives=archives.gentoo.org@lists.gentoo.org>) id 1RJf9T-0005Vm-Lf for garchives@archives.gentoo.org; Fri, 28 Oct 2011 05:38:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13996E0477; Fri, 28 Oct 2011 05:38:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DAEA1E0477 for <gentoo-commits@lists.gentoo.org>; Fri, 28 Oct 2011 05:38:39 +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 613431B400A for <gentoo-commits@lists.gentoo.org>; Fri, 28 Oct 2011 05:38:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 712F880042 for <gentoo-commits@lists.gentoo.org>; Fri, 28 Oct 2011 05:38:38 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <bcb6106c7547738bd00e31b53b0cec582e1ac84c.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: bcb6106c7547738bd00e31b53b0cec582e1ac84c Date: Fri, 28 Oct 2011 05:38:38 +0000 (UTC) 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: X-Archives-Hash: 5bf0bfec268cded529de275decbc41ce commit: bcb6106c7547738bd00e31b53b0cec582e1ac84c Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Fri Oct 28 05:38:31 2011 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Fri Oct 28 05:38:31 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dbcb6106c RepoConfigLoader: comment on masters override --- pym/portage/repository/config.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/co= nfig.py index 2cc8a0b..5b5ddd6 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -385,6 +385,8 @@ class RepoConfigLoader(object): layout_filename =3D os.path.join(repo.location, "metadata", "layout.c= onf") layout_data, layout_errors =3D parse_layout_conf(repo.location, repo.= name) =20 + # layout.conf masters may be overridden here if we have a masters + # setting from the user's repos.conf if repo.masters is None: repo.masters =3D layout_data['masters'] =20