From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 22 Sep 2006 23:57:01 +0000 (-0000)
Subject: Ensure that soft_dep is a plain boolean (not vardb match results).
X-Git-Tag: v2.1.1-r1~29
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8554494dcf6f4a9d1b93476aa0fc8f3f9cf3d39b;p=portage.git

Ensure that soft_dep is a plain boolean (not vardb match results).

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

diff --git a/bin/emerge b/bin/emerge
index 71a471660..a5f43a196 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1221,7 +1221,7 @@ class depgraph:
 
 			if myparent:
 				#we are a dependency, so we want to be unconditionally added
-				soft_dep = soft_deps or vardb.match(x)
+				soft_dep = bool(soft_deps or vardb.match(x))
 				if not self.create(selected_pkg[0:3], myparent,
 					myuse=selected_pkg[-1], soft_dep=soft_dep,
 					rev_dep=rev_deps, arg=arg):