Fix depgraph._pkg() to not raise PackageNotFound when myrepo is None

and a package is found, so --resume works.

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 7c4e30aec83fd66a60f9e53bb5913e0137865934..33dbecfb9d27f97d28a8a96d3b673e46d4e890af 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -3287,6 +3287,7 @@ class depgraph(object):
 
                        if type_name == "ebuild" and myrepo is None:
                                #We're asked to return a matching Package from any repo.
+                               metadata = None
                                for repo in db.getRepositories():
                                        if not db.cpv_exists(cpv, myrepo=repo):
                                                continue
@@ -3296,7 +3297,8 @@ class depgraph(object):
                                                continue
                                        else:
                                                break
-                               raise portage.exception.PackageNotFound(cpv)
+                               if metadata is None:
+                                       raise portage.exception.PackageNotFound(cpv)
                        else:
                                try:
                                        metadata = zip(db_keys, db.aux_get(cpv, db_keys, myrepo=myrepo))