From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 21 Jun 2007 03:42:16 +0000 (-0000)
Subject: Make IUSE handling safe for IUSE defaults.
X-Git-Tag: v2.2_pre1~1209
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=11941f131b5fef54b3a4021f4285d7804a065935;p=portage.git

Make IUSE handling safe for IUSE defaults.

svn path=/main/trunk/; revision=6897
---

diff --git a/bin/quickpkg b/bin/quickpkg
index a0799f1b1..0070ffac9 100755
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -54,8 +54,10 @@ def quickpkg_main(options, args, eout):
 				if not dblnk.exists():
 					# unmerged by a concurrent process
 					continue
-				uses = dblnk.vartree.dbapi.aux_get(cpv, ["IUSE","USE"])
-				if "bindist" in uses[0] and "bindist" not in uses[1]:
+				iuse, use = vardb.aux_get(cpv, ["IUSE","USE"])
+				iuse = [ x.lstrip("+-") for x in iuse.split() ]
+				use = use.split()
+				if "bindist" in iuse and "bindist" not in use:
 					eout.ewarn("%s: package was emerged with USE=-bindist!" % cpv)
 					eout.ewarn("%s: it may not be legal to redistribute this." % cpv)
 				eout.ebegin("Building package for %s" % cpv)