From 1decf44170bcec923389a5eaf5caf045e2b4bac0 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 27 Oct 2011 22:14:51 -0700 Subject: parse_layout_conf: comment on masters fallback --- pym/portage/repository/config.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pym/portage/repository') diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index d64ad4f2f..19c1aeb86 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=None): data = {} - # 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 = layout_data.get('masters') if masters is not None: masters = tuple(masters.split()) -- cgit v1.2.3-1-g7c22