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 11e5c954dee0ce5f60ec4f44317d3c3be5b90571..ef3e4db6269a8ecba921519054b16e1c24656e11 100644 (file)
--- 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)