* [gentoo-commits] portage r13485 - main/branches/2.1.6/pym/_emerge
@ 2009-04-30 7:04 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2009-04-30 7:04 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2009-04-30 07:04:09 +0000 (Thu, 30 Apr 2009)
New Revision: 13485
Modified:
main/branches/2.1.6/pym/_emerge/__init__.py
Log:
Filter virtuals when expanding atoms if it helps to avoid an ambiguity.
(trunk r13314)
Modified: main/branches/2.1.6/pym/_emerge/__init__.py
===================================================================
--- main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 07:03:56 UTC (rev 13484)
+++ main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 07:04:09 UTC (rev 13485)
@@ -5586,6 +5586,15 @@
atom_cp = portage.dep_getkey(atom)
if vardb.cp_list(atom_cp):
installed_cp_set.add(atom_cp)
+
+ if len(installed_cp_set) > 1:
+ non_virtual_cps = set()
+ for atom_cp in installed_cp_set:
+ if not atom_cp.startswith("virtual/"):
+ non_virtual_cps.add(atom_cp)
+ if len(non_virtual_cps) == 1:
+ installed_cp_set = non_virtual_cps
+
if len(expanded_atoms) > 1 and len(installed_cp_set) == 1:
installed_cp = iter(installed_cp_set).next()
expanded_atoms = [atom for atom in expanded_atoms \
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-04-30 7:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-30 7:04 [gentoo-commits] portage r13485 - main/branches/2.1.6/pym/_emerge Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox