Suppress duplicate repo warning for bug #478544.

diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index 7620c5f0ece564482a58e8c9f588b02df86240e0..5c37da3319dfd6ba0e96e4e3477f88654add7f01 100644 (file)
--- 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: