Clean up repo handling for depgraph pkg_cache.

diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py
index b7b0893382108c111e7289c0b7f0eebf77fc837a..64a39cf4d961b5fc69c153167ee488935f97d027 100644 (file)
--- a/pym/_emerge/FakeVartree.py
+++ b/pym/_emerge/FakeVartree.py
@@ -200,11 +200,7 @@ class FakeVartree(vartree):
                        mycounter = 0
                        pkg.metadata["COUNTER"] = str(mycounter)
 
-               #For installed (and binary) packages we don't care for the repo when it comes to
-               #caching, because there can only be one cpv. So overwrite the repo key with type_name.
-               #Make sure that .operation is computed.
-               pkg._get_hash_key()
-               self._pkg_cache[(pkg.type_name, pkg.root, pkg.cpv, pkg.operation, pkg.type_name)] = pkg
+               self._pkg_cache[pkg] = pkg
                return pkg
 
 def grab_global_updates(portdb):

diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py
index c54ece186ecff0b43ca02366b1b8bc0bb78d422f..ae82c5246e4bf90e6ea03259f727e6138e472242 100644 (file)
--- a/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@ -382,8 +382,14 @@ class Package(Task):
                                self.operation = "merge"
                                if self.onlydeps or self.installed:
                                        self.operation = "nomerge"
+                       # For installed (and binary) packages we don't care for the repo
+                       # when it comes to hashing, because there can only be one cpv.
+                       # So overwrite the repo_key with type_name.
+                       repo_key = self.metadata.get('repository')
+                       if self.type_name != 'ebuild':
+                               repo_key = self.type_name
                        self._hash_key = \
-                               (self.type_name, self.root, self.cpv, self.operation, self.metadata.get('repository', None))
+                               (self.type_name, self.root, self.cpv, self.operation, repo_key)
                return self._hash_key
 
        def __len__(self):

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 64a25ceb1f4f8812cf97218d96811c12069a8d38..e65b942b16e48eef89cec0db025f1c0ba4e04b44 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -1573,7 +1573,8 @@ class depgraph(object):
                                        raise portage.exception.PackageNotFound(
                                                "%s is not in a valid portage tree hierarchy or does not exist" % x)
                                pkg = self._pkg(mykey, "ebuild", root_config,
-                                       onlydeps=onlydeps)
+                                       onlydeps=onlydeps, myrepo=portdb.getRepositoryName(
+                                       os.path.dirname(os.path.dirname(os.path.dirname(ebuild_path)))))
                                args.append(PackageArg(arg=x, package=pkg,
                                        root_config=root_config))
                        elif x.startswith(os.path.sep):
@@ -2898,7 +2899,7 @@ class depgraph(object):
                                                                else:
                                                                        try:
                                                                                pkg_eb = self._pkg(
-                                                                                       pkg.cpv, "ebuild", root_config, myrepo=atom.repo)
+                                                                                       pkg.cpv, "ebuild", root_config, myrepo=pkg.repo)
                                                                        except portage.exception.PackageNotFound:
                                                                                continue
                                                                        else:
@@ -3297,8 +3298,14 @@ class depgraph(object):
                failures for some reason (package does not exist or is
                corrupt).
                """
-               if type_name != "ebuild" and myrepo is None:
+               if type_name != "ebuild":
+                       # For installed (and binary) packages we don't care for the repo
+                       # when it comes to hashing, because there can only be one cpv.
+                       # So overwrite the repo_key with type_name.
                        myrepo = type_name
+               elif myrepo is None:
+                       raise AssertionError(
+                               "depgraph._pkg() called without 'myrepo' argument")
 
                operation = "merge"
                if installed or onlydeps:
@@ -3319,42 +3326,16 @@ class depgraph(object):
                        db_keys = list(self._frozen_config._trees_orig[root_config.root][
                                tree_type].dbapi._aux_cache_keys)
 
-                       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
-                                       try:
-                                               metadata = zip(db_keys, db.aux_get(cpv, db_keys, myrepo=repo))
-                                       except KeyError:
-                                               continue
-                                       else:
-                                               break
-                               if metadata is None:
-                                       raise portage.exception.PackageNotFound(cpv)
-                       else:
-                               try:
-                                       metadata = zip(db_keys, db.aux_get(cpv, db_keys, myrepo=myrepo))
-                               except KeyError:
-                                       raise portage.exception.PackageNotFound(cpv)
+                       try:
+                               metadata = zip(db_keys, db.aux_get(cpv, db_keys, myrepo=myrepo))
+                       except KeyError:
+                               raise portage.exception.PackageNotFound(cpv)
 
                        pkg = Package(built=(type_name != "ebuild"), cpv=cpv,
                                installed=installed, metadata=metadata, onlydeps=onlydeps,
                                root_config=root_config, type_name=type_name)
 
-                       if type_name == "ebuild":
-                               self._frozen_config._pkg_cache[pkg] = pkg
-                               if myrepo is None:
-                                       self._frozen_config._pkg_cache[
-                                               (pkg.type_name, pkg.root, pkg.cpv, pkg.operation, None)] = pkg
-                       else:
-                               #For installed and binary packages we don't care for the repo when it comes to
-                               #caching, because there can only be one cpv. So overwrite the repo key with type_name.
-                               #Make sure that .operation is computed.
-                               pkg._get_hash_key()
-                               self._frozen_config._pkg_cache[
-                                       (pkg.type_name, pkg.root, pkg.cpv, pkg.operation, pkg.type_name)] = pkg
+                       self._frozen_config._pkg_cache[pkg] = pkg
 
                        if not self._pkg_visibility_check(pkg) and \
                                'LICENSE' in pkg.masks and len(pkg.masks) == 1:
@@ -5658,7 +5639,9 @@ def show_masked_packages(masked_packages):
        have_eapi_mask = False
        for (root_config, pkgsettings, cpv, repo,
                metadata, mreasons) in masked_packages:
-               output_cpv = cpv + _repo_separator + repo
+               output_cpv = cpv
+               if repo:
+                       output_cpv += _repo_separator + repo
                if output_cpv in shown_cpvs:
                        continue
                shown_cpvs.add(output_cpv)