diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-06-30 04:13:47 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-06-30 04:13:47 +0000 |
| commit | 5624d5f205423b19613822b3ef9cb3a2d961a5e3 (patch) | |
| tree | 386742f97e0cbdea62a6387a10e37589aaad8bcd | |
| parent | 31a8c3a4b7ddf530eb9094b9110ea068acdbbc31 (diff) | |
| download | portage-5624d5f205423b19613822b3ef9cb3a2d961a5e3.tar.gz portage-5624d5f205423b19613822b3ef9cb3a2d961a5e3.tar.bz2 portage-5624d5f205423b19613822b3ef9cb3a2d961a5e3.zip | |
In _expand_new_virtuals, don't expand old-style virtuals when there is
a new-style match.
svn path=/main/trunk/; revision=13741
| -rw-r--r-- | pym/portage/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index f98dbbb1d..99715c740 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -7010,8 +7010,9 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", mycheck[1].append(portage.dep.Atom("="+y[0])) a.append(mycheck[1]) # Plain old-style virtuals. New-style virtuals are preferred. - for y in mychoices: - a.append(portage.dep.Atom(x.replace(mykey, y, 1))) + if not pkgs: + for y in mychoices: + a.append(portage.dep.Atom(x.replace(mykey, y, 1))) if isblocker and not a: # Probably a compound virtual. Pass the atom through unprocessed. newsplit.append(x) |