aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2013-07-29 10:23:02 -0700
committerZac Medico <zmedico@gentoo.org>2013-07-29 10:23:02 -0700
commita3a1a20a1378e423486d41414857a25f9bec1c66 (patch)
tree850886e4454bb2d59892a9eb49ef2c55648f01a1 /pym/portage/repository/config.py
parentdepgraph: avoid conflicts during _complete_graph (diff)
downloadportage-a3a1a20a1378e423486d41414857a25f9bec1c66.tar.gz
portage-a3a1a20a1378e423486d41414857a25f9bec1c66.tar.bz2
portage-a3a1a20a1378e423486d41414857a25f9bec1c66.zip
Suppress duplicate repo warning for bug #478544.
Diffstat (limited to 'pym/portage/repository/config.py')
-rw-r--r--pym/portage/repository/config.py6
1 files 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: