* [gentoo-commits] portage r11758 - in main/trunk/pym: _emerge portage/dbapi
@ 2008-10-30 22:44 99% Zac Medico (zmedico)
0 siblings, 0 replies; 1+ results
From: Zac Medico (zmedico) @ 2008-10-30 22:44 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2008-10-30 22:44:55 +0000 (Thu, 30 Oct 2008)
New Revision: 11758
Modified:
main/trunk/pym/_emerge/__init__.py
main/trunk/pym/portage/dbapi/vartree.py
Log:
Use portage.const.PORTAGE_PACKAGE_ATOM where appropriate.
Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py 2008-10-30 22:25:27 UTC (rev 11757)
+++ main/trunk/pym/_emerge/__init__.py 2008-10-30 22:44:55 UTC (rev 11758)
@@ -11753,9 +11753,11 @@
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())
Modified: main/trunk/pym/portage/dbapi/vartree.py
===================================================================
--- main/trunk/pym/portage/dbapi/vartree.py 2008-10-30 22:25:27 UTC (rev 11757)
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-10-30 22:44:55 UTC (rev 11758)
@@ -8,11 +8,11 @@
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 @@
# 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 @@
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
^ permalink raw reply [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2008-10-30 22:44 99% [gentoo-commits] portage r11758 - in main/trunk/pym: _emerge portage/dbapi Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox