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 1RJemd-0007in-Ra for garchives@archives.gentoo.org; Fri, 28 Oct 2011 05:15:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C624821C02A; Fri, 28 Oct 2011 05:15:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9704321C02A for ; Fri, 28 Oct 2011 05:15:04 +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 DC75D1B401A for ; Fri, 28 Oct 2011 05:15:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4DEBA80042 for ; Fri, 28 Oct 2011 05:15:03 +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: <1decf44170bcec923389a5eaf5caf045e2b4bac0.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: 1decf44170bcec923389a5eaf5caf045e2b4bac0 Date: Fri, 28 Oct 2011 05:15:03 +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: X-Archives-Hash: a282dbf9c50ab1dfabe4ac22765dab40 commit: 1decf44170bcec923389a5eaf5caf045e2b4bac0 Author: Zac Medico gentoo org> AuthorDate: Fri Oct 28 05:14:51 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Oct 28 05:14:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D1decf441 parse_layout_conf: comment on masters fallback --- pym/portage/repository/config.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/co= nfig.py index d64ad4f..19c1aeb 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -622,8 +622,11 @@ def parse_layout_conf(repo_location, repo_name=3DNon= e): =20 data =3D {} =20 - # allow None to slip through; later code spots that as an indication - # that an explicit nulling of the overlaying is desired. + # None indicates abscence of a masters setting, which later code uses + # to trigger a backward compatibility fallback that sets an implicit + # master. In order to avoid this fallback behavior, layout.conf can + # explicitly set masters to an empty value, which will result in an + # empty tuple here instead of None. masters =3D layout_data.get('masters') if masters is not None: masters =3D tuple(masters.split())