summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-02-05 06:46:31 +0000
committerZac Medico <zmedico@gentoo.org>2007-02-05 06:46:31 +0000
commit59a651f01b787a307ffbeccbb11a61d9b62d9136 (patch)
tree4c397f33eb343148c19af6636251280cd73dc742
parentbf32173b3aa1f47a6467561892938369133b2a4e (diff)
downloadportage-59a651f01b787a307ffbeccbb11a61d9b62d9136.tar.gz
portage-59a651f01b787a307ffbeccbb11a61d9b62d9136.tar.bz2
portage-59a651f01b787a307ffbeccbb11a61d9b62d9136.zip
Ensure that the code for bug #165342 only affects name collisions with virtuals.
svn path=/main/trunk/; revision=5891
-rw-r--r--pym/portage/__init__.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 913c70563..a2d91c15e 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4447,6 +4447,7 @@ def cpv_expand(mycpv, mydb=None, use_cache=1, settings=None):
if mydb.cp_list(x+"/"+myp,use_cache=use_cache):
matches.append(x+"/"+myp)
if len(matches) > 1:
+ virtual_name_collision = False
if len(matches) == 2:
for x in matches:
if not x.startswith("virtual/"):
@@ -4455,8 +4456,9 @@ def cpv_expand(mycpv, mydb=None, use_cache=1, settings=None):
# installed packages (during reverse blocker detection,
# for example).
mykey = x
- break
- if mykey is None:
+ else:
+ virtual_name_collision = True
+ if not virtual_name_collision:
raise ValueError, matches
elif matches:
mykey=matches[0]