diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-05 22:00:44 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-05 22:00:44 +0000 |
| commit | a9f650cea692eccfde565fe5c7a1a01f235230cb (patch) | |
| tree | 38f49263d2c14da9807458550dff9509fdf3b49a /pym | |
| parent | 73e16af5486d3664078591681ed7ec3c4671ccf3 (diff) | |
| download | portage-a9f650cea692eccfde565fe5c7a1a01f235230cb.tar.gz portage-a9f650cea692eccfde565fe5c7a1a01f235230cb.tar.bz2 portage-a9f650cea692eccfde565fe5c7a1a01f235230cb.zip | |
Ensure that the code for bug #165382 only affects name collisions with virtuals. (trunk r5890:5891)
svn path=/main/branches/2.1.2/; revision=5901
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py index 5c4389c9c..f6dfdcf84 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -4435,6 +4435,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/"): @@ -4443,8 +4444,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] |