From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 9 Oct 2007 15:46:11 +0000 (-0000)
Subject: Fix InvalidDependString namespace and initialize USE before
X-Git-Tag: v2.2_pre1~674
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cd5a8992c7a23b0d5bd92c30c7c9e6111ea170ef;p=portage.git

Fix InvalidDependString namespace and initialize USE before
visibility check.

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

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 11e5c954d..ef3e4db62 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -2008,11 +2008,13 @@ class depgraph(object):
 					if "?" in metadata["LICENSE"]:
 						pkgsettings.setcpv(cpv, mydb=metadata)
 						metadata["USE"] = pkgsettings["USE"]
+					else:
+						metadata["USE"] = ""
 					try:
 						if not visible(pkgsettings, cpv, metadata,
 							built=False, installed=False):
 							continue
-					except InvalidDependString:
+					except portage.exception.InvalidDependString:
 						# masked by corruption
 						continue
 
@@ -2053,7 +2055,7 @@ class depgraph(object):
 							if not visible(pkgsettings, pkg, metadata,
 								built=True, installed=False):
 								continue
-						except InvalidDependString:
+						except portage.exception.InvalidDependString:
 							# masked by corruption
 							continue
 						myeb_pkg_matches.append(pkg)