* [gentoo-commits] portage r13739 - main/trunk/pym/portage
@ 2009-06-30 0:01 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2009-06-30 0:01 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2009-06-30 00:01:08 +0000 (Tue, 30 Jun 2009)
New Revision: 13739
Modified:
main/trunk/pym/portage/__init__.py
Log:
Fix virtual blocker code inside _expand_new_virtuals to correctly handle
!!atom blockers.
Modified: main/trunk/pym/portage/__init__.py
===================================================================
--- main/trunk/pym/portage/__init__.py 2009-06-29 23:44:55 UTC (rev 13738)
+++ main/trunk/pym/portage/__init__.py 2009-06-30 00:01:08 UTC (rev 13739)
@@ -6941,7 +6941,8 @@
continue
match_atom = x
if isblocker:
- match_atom = x[1:]
+ match_atom = x.lstrip("!")
+ isblocker = x[:-len(match_atom)]
pkgs = []
matches = portdb.match(match_atom)
# Use descending order to prefer higher versions.
@@ -7003,7 +7004,7 @@
if len(virtual_atoms) == 1:
# It wouldn't make sense to block all the components of a
# compound virtual, so only a single atom block is allowed.
- a.append(portage.dep.Atom("!" + virtual_atoms[0]))
+ a.append(portage.dep.Atom(isblocker + virtual_atoms[0]))
else:
# pull in the new-style virtual
mycheck[1].append(portage.dep.Atom("="+y[0]))
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-06-30 0:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-30 0:01 [gentoo-commits] portage r13739 - main/trunk/pym/portage 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