From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 31 May 2007 21:30:08 +0000 (-0000)
Subject: Make dep_zapdeps() pull SLOT from the correct dbapi instance when it falls back to... 
X-Git-Tag: v2.1.2.10~29
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=369ee750dc5a991160d5d01ddda964bcb47c8ecb;p=portage.git

Make dep_zapdeps() pull SLOT from the correct dbapi instance when it falls back to the vdb. (trunk r6698)

svn path=/main/branches/2.1.2/; revision=6700
---

diff --git a/pym/portage.py b/pym/portage.py
index 199dac8fc..16f105394 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4215,16 +4215,21 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None):
 		versions = {}
 		for atom in atoms:
 			avail_pkg = best(mydbapi.match(atom))
-			if not avail_pkg and use_binaries:
+			if avail_pkg:
+				avail_slot = "%s:%s" % (dep_getkey(atom),
+					mydbapi.aux_get(avail_pkg, ["SLOT"])[0])
+			elif not avail_pkg and use_binaries:
 				# With --usepkgonly, count installed packages as "available".
 				# Note that --usepkgonly currently has no package.mask support.
 				# See bug #149816.
 				avail_pkg = best(vardb.match(atom))
+				if avail_pkg:
+					avail_slot = "%s:%s" % (dep_getkey(atom),
+						vardb.aux_get(avail_pkg, ["SLOT"])[0])
 			if not avail_pkg:
 				all_available = False
 				break
-			avail_slot = "%s:%s" % (dep_getkey(atom),
-				mydbapi.aux_get(avail_pkg, ["SLOT"])[0])
+
 			versions[avail_slot] = avail_pkg
 
 		this_choice = (atoms, versions, all_available)