diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-27 00:43:46 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-27 00:43:46 +0000 |
| commit | 0311c828dc14d814edcaeb851c1d1d302b06519e (patch) | |
| tree | 1071464149d95765077f1e8d0115bed45db34264 | |
| parent | 7ac8b9e99877a782e85611d2f0f638b355a5b5ee (diff) | |
| download | portage-0311c828dc14d814edcaeb851c1d1d302b06519e.tar.gz portage-0311c828dc14d814edcaeb851c1d1d302b06519e.tar.bz2 portage-0311c828dc14d814edcaeb851c1d1d302b06519e.zip | |
Remove unnecessary "mydbapi" variable in depgraph.display().
svn path=/main/trunk/; revision=9990
| -rw-r--r-- | pym/_emerge/__init__.py | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index fd36269e8..a73a7423b 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -3994,14 +3994,6 @@ class depgraph(object): pkg_merge = ordered and pkg_status == "merge" if not pkg_merge and pkg_status == "merge": pkg_status = "nomerge" - if pkg_status == "uninstall": - mydbapi = vardb - elif pkg in self._slot_collision_nodes or pkg.onlydeps: - # The metadata isn't cached due to a slot collision or - # --onlydeps. - mydbapi = self.trees[myroot][self.pkg_tree_map[pkg_type]].dbapi - else: - mydbapi = self.mydbapi[myroot] # contains cached metadata ebuild_path = None repo_name = metadata["repository"] built = pkg_type != "ebuild" @@ -4020,8 +4012,8 @@ class depgraph(object): pkg.metadata["RESTRICT"]), uselist=pkg_use)) except portage.exception.InvalidDependString, e: if not pkg.installed: - restrict = mydbapi.aux_get(pkg_key, ["RESTRICT"])[0] - show_invalid_depstring_notice(x, restrict, str(e)) + show_invalid_depstring_notice(x, + pkg.metadata["RESTRICT"], str(e)) del e return 1 restrict = [] @@ -4050,10 +4042,7 @@ class depgraph(object): elif installed_versions and \ portage.cpv_getkey(installed_versions[0]) == \ portage.cpv_getkey(pkg_key): - mynewslot = mydbapi.aux_get(pkg_key, ["SLOT"])[0] - slot_atom = "%s:%s" % \ - (portage.cpv_getkey(pkg_key), mynewslot) - myinslotlist = vardb.match(slot_atom) + myinslotlist = vardb.match(pkg.slot_atom) # If this is the first install of a new-style virtual, we # need to filter out old-style virtual matches. if myinslotlist and \ |