| 1 |
Author: zmedico |
| 2 |
Date: 2008-04-27 00:44:34 +0000 (Sun, 27 Apr 2008) |
| 3 |
New Revision: 9991 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Remove unnecessary "mydbapi" variable in depgraph.display(). (trunk r9990) |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/branches/2.1.2/bin/emerge |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.2/bin/emerge 2008-04-27 00:43:46 UTC (rev 9990) |
| 14 |
+++ main/branches/2.1.2/bin/emerge 2008-04-27 00:44:34 UTC (rev 9991) |
| 15 |
@@ -4141,14 +4141,6 @@ |
| 16 |
pkg_merge = ordered and pkg_status == "merge" |
| 17 |
if not pkg_merge and pkg_status == "merge": |
| 18 |
pkg_status = "nomerge" |
| 19 |
- if pkg_status == "uninstall": |
| 20 |
- mydbapi = vardb |
| 21 |
- elif pkg in self._slot_collision_nodes or pkg.onlydeps: |
| 22 |
- # The metadata isn't cached due to a slot collision or |
| 23 |
- # --onlydeps. |
| 24 |
- mydbapi = self.trees[myroot][self.pkg_tree_map[pkg_type]].dbapi |
| 25 |
- else: |
| 26 |
- mydbapi = self.mydbapi[myroot] # contains cached metadata |
| 27 |
ebuild_path = None |
| 28 |
repo_name = metadata["repository"] |
| 29 |
built = pkg_type != "ebuild" |
| 30 |
@@ -4167,8 +4159,8 @@ |
| 31 |
pkg.metadata["RESTRICT"]), uselist=pkg_use)) |
| 32 |
except portage_exception.InvalidDependString, e: |
| 33 |
if not pkg.installed: |
| 34 |
- restrict = mydbapi.aux_get(pkg_key, ["RESTRICT"])[0] |
| 35 |
- show_invalid_depstring_notice(x, restrict, str(e)) |
| 36 |
+ show_invalid_depstring_notice(x, |
| 37 |
+ pkg.metadata["RESTRICT"], str(e)) |
| 38 |
del e |
| 39 |
return 1 |
| 40 |
restrict = [] |
| 41 |
@@ -4197,10 +4189,7 @@ |
| 42 |
elif installed_versions and \ |
| 43 |
portage.cpv_getkey(installed_versions[0]) == \ |
| 44 |
portage.cpv_getkey(pkg_key): |
| 45 |
- mynewslot = mydbapi.aux_get(pkg_key, ["SLOT"])[0] |
| 46 |
- slot_atom = "%s:%s" % \ |
| 47 |
- (portage.cpv_getkey(pkg_key), mynewslot) |
| 48 |
- myinslotlist = vardb.match(slot_atom) |
| 49 |
+ myinslotlist = vardb.match(pkg.slot_atom) |
| 50 |
# If this is the first install of a new-style virtual, we |
| 51 |
# need to filter out old-style virtual matches. |
| 52 |
if myinslotlist and \ |
| 53 |
|
| 54 |
-- |
| 55 |
gentoo-commits@l.g.o mailing list |
Archives