From a3a1a20a1378e423486d41414857a25f9bec1c66 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 29 Jul 2013 10:23:02 -0700 Subject: [PATCH] Suppress duplicate repo warning for bug #478544. --- pym/portage/repository/config.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index 7620c5f0e..5c37da331 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -453,11 +453,13 @@ class RepoConfigLoader(object): setattr(repo, k, v) if repo.name in prepos: + # Silently ignore when PORTDIR overrides the location + # setting from the default repos.conf (bug #478544). old_location = prepos[repo.name].location if old_location is not None and \ old_location != repo.location and \ - not (old_location == default_portdir and - not exists_raise_eaccess(old_location)): + not (base_priority == 0 and + old_location == default_portdir): ignored_map.setdefault(repo.name, []).append(old_location) ignored_location_map[old_location] = repo.name if old_location == portdir: -- 2.26.2