diff options
| -rw-r--r-- | pym/_emerge/__init__.py | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index cd17ca60c..ad4daf989 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -1047,9 +1047,6 @@ class FakeVartree(portage.vartree): self.root = real_vartree.root self.settings = real_vartree.settings mykeys = list(real_vartree.dbapi._aux_cache_keys) - for required_key in ("COUNTER", "SLOT"): - if required_key not in mykeys: - mykeys.append(required_key) self._pkg_cache = pkg_cache self.dbapi = PackageVirtualDbapi(real_vartree.settings) vdb_path = os.path.join(self.root, portage.VDB_PATH) @@ -1209,9 +1206,9 @@ class FakeVartree(portage.vartree): def _pkg(self, cpv): root_config = self._root_config real_vardb = root_config.trees["vartree"].dbapi + db_keys = list(real_vardb._aux_cache_keys) pkg = Package(cpv=cpv, installed=True, - metadata=izip(Package.metadata_keys, - real_vardb.aux_get(cpv, Package.metadata_keys)), + metadata=izip(db_keys, real_vardb.aux_get(cpv, db_keys)), root_config=root_config, type_name="installed") return pkg @@ -4061,8 +4058,6 @@ class depgraph(object): pkg_tree_map = RootConfig.pkg_tree_map - _mydbapi_keys = Package.metadata_keys - _dep_keys = ["DEPEND", "RDEPEND", "PDEPEND"] # If dep calculation time exceeds this value then automatically @@ -4797,8 +4792,8 @@ class depgraph(object): os.path.realpath(self.trees[myroot]["bintree"].getname(mykey)): print colorize("BAD", "\n*** You need to adjust PKGDIR to emerge this package.\n") return 0, myfavorites - metadata = izip(self._mydbapi_keys, - bindb.aux_get(mykey, self._mydbapi_keys)) + db_keys = list(bindb._aux_cache_keys) + metadata = izip(db_keys, bindb.aux_get(mykey, db_keys)) pkg = Package(type_name="binary", root_config=root_config, cpv=mykey, built=True, metadata=metadata, onlydeps=onlydeps) @@ -4835,8 +4830,8 @@ class depgraph(object): else: raise portage.exception.PackageNotFound( "%s is not in a valid portage tree hierarchy or does not exist" % x) - metadata = izip(self._mydbapi_keys, - portdb.aux_get(mykey, self._mydbapi_keys)) + db_keys = list(portdb._aux_cache_keys) + metadata = izip(db_keys, portdb.aux_get(mykey, db_keys)) pkg = Package(type_name="ebuild", root_config=root_config, cpv=mykey, metadata=metadata, onlydeps=onlydeps) pkgsettings.setcpv(pkg) @@ -7601,10 +7596,12 @@ class depgraph(object): continue if action != "merge": continue - mydb = trees[myroot][self.pkg_tree_map[pkg_type]].dbapi + tree_type = self.pkg_tree_map[pkg_type] + mydb = trees[myroot][tree_type].dbapi + db_keys = list(self._trees_orig[myroot][ + tree_type].dbapi._aux_cache_keys) try: - metadata = izip(self._mydbapi_keys, - mydb.aux_get(pkg_key, self._mydbapi_keys)) + metadata = izip(db_keys, mydb.aux_get(pkg_key, db_keys)) except KeyError: # It does no exist or it is corrupt. if action == "uninstall": @@ -10004,10 +10001,11 @@ class Scheduler(PollScheduler): if installed: operation = "nomerge" - db = root_config.trees[ - depgraph.pkg_tree_map[type_name]].dbapi - metadata = izip(Package.metadata_keys, - db.aux_get(cpv, Package.metadata_keys)) + tree_type = depgraph.pkg_tree_map[type_name] + db = root_config.trees[tree_type].dbapi + db_keys = list(self.trees[root_config.root][ + tree_type].dbapi._aux_cache_keys) + metadata = izip(db_keys, db.aux_get(cpv, db_keys)) pkg = Package(cpv=cpv, metadata=metadata, root_config=root_config, installed=installed) if type_name == "ebuild": @@ -10146,13 +10144,13 @@ def unmerge(root_config, myopts, unmerge_action, xterm_titles = "notitles" not in settings.features pkg_cache = {} + db_keys = list(vartree.dbapi._aux_cache_keys) def _pkg(cpv): pkg = pkg_cache.get(cpv) if pkg is None: pkg = Package(cpv=cpv, installed=True, - metadata=izip(Package.metadata_keys, - vartree.dbapi.aux_get(cpv, Package.metadata_keys)), + metadata=izip(db_keys, vartree.dbapi.aux_get(cpv, db_keys)), root_config=root_config, type_name="installed") pkg_cache[cpv] = pkg |