diff options
-rw-r--r-- | 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/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()) |