| 1 |
Author: zmedico |
| 2 |
Date: 2008-04-02 19:09:13 +0000 (Wed, 02 Apr 2008) |
| 3 |
New Revision: 9680 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Use Package.cp instead of dep_getkey(cpv). |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/__init__.py 2008-04-02 18:13:08 UTC (rev 9679) |
| 14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-04-02 19:09:13 UTC (rev 9680) |
| 15 |
@@ -3631,6 +3631,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 |
@@ -3641,6 +3643,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 |
try: |
| 33 |
restrict = flatten(use_reduce(paren_reduce( |
| 34 |
@@ -4785,8 +4790,7 @@ |
| 35 |
"--fetch-all-uri" not in self.myopts: |
| 36 |
|
| 37 |
# Figure out if we need a restart. |
| 38 |
- if myroot == "/" and \ |
| 39 |
- portage.dep_getkey(pkg_key) == "sys-apps/portage": |
| 40 |
+ if myroot == "/" and pkg_node.cp == "sys-apps/portage": |
| 41 |
if len(mymergelist) > mergecount: |
| 42 |
emergelog(xterm_titles, |
| 43 |
" ::: completed emerge ("+ \ |
| 44 |
|
| 45 |
-- |
| 46 |
gentoo-commits@l.g.o mailing list |
Archives