Use portage.const.PORTAGE_PACKAGE_ATOM where appropriate.

svn path=/main/trunk/; revision=11758

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index bbfd073973693acfbb50ffcd9f209faf17bb404c..2cf7d132937f6e711311d01c0f00f67e8476eadb 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -11753,9 +11753,11 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
                portdb = trees[settings["ROOT"]]["porttree"].dbapi
                root_config = trees[settings["ROOT"]]["root_config"]
 
-       mybestpv = portdb.xmatch("bestmatch-visible", "sys-apps/portage")
+       mybestpv = portdb.xmatch("bestmatch-visible",
+               portage.const.PORTAGE_PACKAGE_ATOM)
        mypvs = portage.best(
-               trees[settings["ROOT"]]["vartree"].dbapi.match("sys-apps/portage"))
+               trees[settings["ROOT"]]["vartree"].dbapi.match(
+               portage.const.PORTAGE_PACKAGE_ATOM))
 
        chk_updated_cfg_files("/", settings.get("CONFIG_PROTECT","").split())
 

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index e79e4d597a9d20137b7920b32b1104e79609893e..d249a71d754eaeb38647c546530f4d5b7d6cc76b 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -8,11 +8,11 @@ __all__ = ["PreservedLibsRegistry", "LinkageMap",
 
 from portage.checksum import perform_md5
 from portage.const import CACHE_PATH, CONFIG_MEMORY_FILE, \
-       PRIVATE_PATH, VDB_PATH
+       PORTAGE_PACKAGE_ATOM, PRIVATE_PATH, VDB_PATH
 from portage.data import portage_gid, portage_uid, secpass
 from portage.dbapi import dbapi
 from portage.dep import use_reduce, paren_reduce, isvalidatom, \
-       isjustname, dep_getkey
+       isjustname, dep_getkey, match_from_list
 from portage.exception import InvalidData, InvalidPackageName, \
        FileNotFound, PermissionDenied, UnsupportedAPIException
 from portage.locks import lockdir, unlockdir
@@ -3248,8 +3248,7 @@ class dblink(object):
                # PORTAGE_BIN_PATH that will be removed when we return.
                reinstall_self = False
                if self.myroot == "/" and \
-                       "sys-apps" == self.cat and \
-                       "portage" == pkgsplit(self.pkg)[0]:
+                       match_from_list(PORTAGE_PACKAGE_ATOM, [self.mycpv]):
                        reinstall_self = True
 
                autoclean = self.settings.get("AUTOCLEAN", "yes") == "yes"
@@ -3636,8 +3635,7 @@ class dblink(object):
                if self.vartree.dbapi._categories is not None:
                        self.vartree.dbapi._categories = None
                if self.myroot == "/" and \
-                       "sys-apps" == self.cat and \
-                       "portage" == pkgsplit(self.pkg)[0]:
+                       match_from_list(PORTAGE_PACKAGE_ATOM, [self.mycpv]):
                        settings = self.settings
                        base_path_orig = os.path.dirname(settings["PORTAGE_BIN_PATH"])
                        from tempfile import mkdtemp