summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-10-09 15:46:11 +0000
committerZac Medico <zmedico@gentoo.org>2007-10-09 15:46:11 +0000
commitcd5a8992c7a23b0d5bd92c30c7c9e6111ea170ef (patch)
tree25baca9a8d2ad01c523c517f8c26ed0050fc4d28
parentd0237500098f6048203272754a0f4f5cd750d77b (diff)
downloadportage-cd5a8992c7a23b0d5bd92c30c7c9e6111ea170ef.tar.gz
portage-cd5a8992c7a23b0d5bd92c30c7c9e6111ea170ef.tar.bz2
portage-cd5a8992c7a23b0d5bd92c30c7c9e6111ea170ef.zip
Fix InvalidDependString namespace and initialize USE before
visibility check. svn path=/main/trunk/; revision=8015
-rw-r--r--pym/emerge/__init__.py6
1 files changed, 4 insertions, 2 deletions
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)