[gentoo-commits] portage r9637 - main/trunk/pym/portage/dbapi

[gentoo-commits] portage r9637 - main/trunk/pym/portage/dbapi

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-03-30 21:54:51 +0000 (Sun, 30 Mar 2008)
New Revision: 9637

Modified:
   main/trunk/pym/portage/dbapi/vartree.py
Log:
When dblink.treewalk() queries for other packages in the same slot, filter
out old-style virtual matches since they are not desired.


Modified: main/trunk/pym/portage/dbapi/vartree.py
===================================================================
--- main/trunk/pym/portage/dbapi/vartree.py	2008-03-30 21:40:42 UTC (rev 9636)
+++ main/trunk/pym/portage/dbapi/vartree.py	2008-03-30 21:54:51 UTC (rev 9637)
@@ -21,7 +21,7 @@
 
 from portage import listdir, dep_expand, flatten, key_expand, \
 	doebuild_environment, doebuild, env_update, prepare_build_dirs, \
-	abssymlink, movefile, _movefile, bsd_chflags
+	abssymlink, movefile, _movefile, bsd_chflags, cpv_getkey
 
 from portage.elog import elog_process
 from portage.elog.messages import ewarn
@@ -1834,8 +1834,11 @@
 		for v in self.vartree.dbapi.cp_list(self.mysplit[0]):
 			otherversions.append(v.split("/")[1])
 
-		slot_matches = self.vartree.dbapi.match(
-			"%s:%s" % (self.mysplit[0], slot))
+		# filter any old-style virtual matches
+		slot_matches = [cpv for cpv in self.vartree.dbapi.match(
+			"%s:%s" % (cpv_getkey(self.mycpv), slot)) \
+			if cpv_getkey(cpv) == cpv_getkey(self.mycpv)]
+
 		if self.mycpv not in slot_matches and \
 			self.vartree.dbapi.cpv_exists(self.mycpv):
 			# handle multislot or unapplied slotmove

-- 
gentoo-commits@lists.gentoo.org mailing list