| 1 |
Author: zmedico |
| 2 |
Date: 2008-10-30 22:44:55 +0000 (Thu, 30 Oct 2008) |
| 3 |
New Revision: 11758 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
main/trunk/pym/portage/dbapi/vartree.py |
| 8 |
Log: |
| 9 |
Use portage.const.PORTAGE_PACKAGE_ATOM where appropriate. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-10-30 22:25:27 UTC (rev 11757) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-10-30 22:44:55 UTC (rev 11758) |
| 16 |
@@ -11753,9 +11753,11 @@ |
| 17 |
portdb = trees[settings["ROOT"]]["porttree"].dbapi |
| 18 |
root_config = trees[settings["ROOT"]]["root_config"] |
| 19 |
|
| 20 |
- mybestpv = portdb.xmatch("bestmatch-visible", "sys-apps/portage") |
| 21 |
+ mybestpv = portdb.xmatch("bestmatch-visible", |
| 22 |
+ portage.const.PORTAGE_PACKAGE_ATOM) |
| 23 |
mypvs = portage.best( |
| 24 |
- trees[settings["ROOT"]]["vartree"].dbapi.match("sys-apps/portage")) |
| 25 |
+ trees[settings["ROOT"]]["vartree"].dbapi.match( |
| 26 |
+ portage.const.PORTAGE_PACKAGE_ATOM)) |
| 27 |
|
| 28 |
chk_updated_cfg_files("/", settings.get("CONFIG_PROTECT","").split()) |
| 29 |
|
| 30 |
|
| 31 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 32 |
=================================================================== |
| 33 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-10-30 22:25:27 UTC (rev 11757) |
| 34 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-10-30 22:44:55 UTC (rev 11758) |
| 35 |
@@ -8,11 +8,11 @@ |
| 36 |
|
| 37 |
from portage.checksum import perform_md5 |
| 38 |
from portage.const import CACHE_PATH, CONFIG_MEMORY_FILE, \ |
| 39 |
- PRIVATE_PATH, VDB_PATH |
| 40 |
+ PORTAGE_PACKAGE_ATOM, PRIVATE_PATH, VDB_PATH |
| 41 |
from portage.data import portage_gid, portage_uid, secpass |
| 42 |
from portage.dbapi import dbapi |
| 43 |
from portage.dep import use_reduce, paren_reduce, isvalidatom, \ |
| 44 |
- isjustname, dep_getkey |
| 45 |
+ isjustname, dep_getkey, match_from_list |
| 46 |
from portage.exception import InvalidData, InvalidPackageName, \ |
| 47 |
FileNotFound, PermissionDenied, UnsupportedAPIException |
| 48 |
from portage.locks import lockdir, unlockdir |
| 49 |
@@ -3248,8 +3248,7 @@ |
| 50 |
# PORTAGE_BIN_PATH that will be removed when we return. |
| 51 |
reinstall_self = False |
| 52 |
if self.myroot == "/" and \ |
| 53 |
- "sys-apps" == self.cat and \ |
| 54 |
- "portage" == pkgsplit(self.pkg)[0]: |
| 55 |
+ match_from_list(PORTAGE_PACKAGE_ATOM, [self.mycpv]): |
| 56 |
reinstall_self = True |
| 57 |
|
| 58 |
autoclean = self.settings.get("AUTOCLEAN", "yes") == "yes" |
| 59 |
@@ -3636,8 +3635,7 @@ |
| 60 |
if self.vartree.dbapi._categories is not None: |
| 61 |
self.vartree.dbapi._categories = None |
| 62 |
if self.myroot == "/" and \ |
| 63 |
- "sys-apps" == self.cat and \ |
| 64 |
- "portage" == pkgsplit(self.pkg)[0]: |
| 65 |
+ match_from_list(PORTAGE_PACKAGE_ATOM, [self.mycpv]): |
| 66 |
settings = self.settings |
| 67 |
base_path_orig = os.path.dirname(settings["PORTAGE_BIN_PATH"]) |
| 68 |
from tempfile import mkdtemp |
Archives