| 1 |
Author: zmedico |
| 2 |
Date: 2008-04-02 19:29:27 +0000 (Wed, 02 Apr 2008) |
| 3 |
New Revision: 9682 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Use Package.cp instead of dep_getkey(cpv). (trunk r9679:9681) |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/branches/2.1.2/bin/emerge |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.2/bin/emerge 2008-04-02 19:22:20 UTC (rev 9681) |
| 14 |
+++ main/branches/2.1.2/bin/emerge 2008-04-02 19:29:27 UTC (rev 9682) |
| 15 |
@@ -3339,6 +3339,8 @@ |
| 16 |
mydbapi.aux_get(pkg_key, self._mydbapi_keys))) |
| 17 |
ebuild_path = None |
| 18 |
repo_name = metadata["repository"] |
| 19 |
+ built = pkg_type != "ebuild" |
| 20 |
+ installed = pkg_type == "installed" |
| 21 |
if pkg_type == "ebuild": |
| 22 |
ebuild_path = portdb.findname(pkg_key) |
| 23 |
if not ebuild_path: # shouldn't happen |
| 24 |
@@ -3349,6 +3351,9 @@ |
| 25 |
metadata["USE"] = pkgsettings["PORTAGE_USE"] |
| 26 |
else: |
| 27 |
repo_path_real = portdb.getRepositoryPath(repo_name) |
| 28 |
+ pkg_node = Package(type_name=pkg_type, root=myroot, |
| 29 |
+ cpv=pkg_key, built=built, installed=installed, |
| 30 |
+ metadata=metadata) |
| 31 |
pkg_use = metadata["USE"].split() |
| 32 |
|
| 33 |
try: |
| 34 |
@@ -4218,8 +4223,10 @@ |
| 35 |
|
| 36 |
mergecount=0 |
| 37 |
for x in mymergelist: |
| 38 |
+ pkg_type = x[0] |
| 39 |
+ if pkg_type == "blocks": |
| 40 |
+ continue |
| 41 |
mergecount+=1 |
| 42 |
- pkg_type = x[0] |
| 43 |
myroot=x[1] |
| 44 |
pkg_key = x[2] |
| 45 |
pkgindex=2 |
| 46 |
@@ -4243,6 +4250,11 @@ |
| 47 |
raise AssertionError("Package type: '%s'" % pkg_type) |
| 48 |
metadata.update(izip(metadata_keys, |
| 49 |
mydbapi.aux_get(pkg_key, metadata_keys))) |
| 50 |
+ built = pkg_type != "ebuild" |
| 51 |
+ installed = pkg_type == "installed" |
| 52 |
+ pkg = Package(type_name=pkg_type, root=myroot, |
| 53 |
+ cpv=pkg_key, built=built, installed=installed, |
| 54 |
+ metadata=metadata) |
| 55 |
if x[0]=="blocks": |
| 56 |
pkgindex=3 |
| 57 |
y = portdb.findname(pkg_key) |
| 58 |
@@ -4470,8 +4482,7 @@ |
| 59 |
"--fetch-all-uri" not in self.myopts: |
| 60 |
|
| 61 |
# Figure out if we need a restart. |
| 62 |
- if myroot == "/" and \ |
| 63 |
- portage.dep_getkey(pkg_key) == "sys-apps/portage": |
| 64 |
+ if myroot == "/" and pkg.cp == "sys-apps/portage": |
| 65 |
if "livecvsportage" not in self.settings.features: |
| 66 |
if len(mymergelist) > mergecount: |
| 67 |
emergelog(xterm_titles, |
| 68 |
|
| 69 |
-- |
| 70 |
gentoo-commits@l.g.o mailing list |
Archives