From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 29 Jul 2013 17:23:02 +0000 (-0700)
Subject: Suppress duplicate repo warning for bug #478544.
X-Git-Tag: v2.2.0_alpha191~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a3a1a20a1378e423486d41414857a25f9bec1c66;p=portage.git

Suppress duplicate repo warning for bug #478544.
---

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: