[gentoo-commits] proj/portage:master commit in: bin/, pym/portage/dep/

[gentoo-commits] proj/portage:master commit in: bin/, pym/portage/dep/

[Zac Medico]

commit:     04463a130cadf6eadcb2f49ba6026a248ea2c9c4
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 01:17:55 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 01:17:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=04463a13

Fix missed ROOT -> EROOT changes.

These go along with commit a715b65f7bd36409c1283e6911265d1f4405ab7a.

---
 bin/emaint                   |    2 +-
 bin/repoman                  |    6 +++---
 pym/portage/dep/dep_check.py |    8 ++++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bin/emaint b/bin/emaint
index ea26e55..1bee0fe 100755
--- a/bin/emaint
+++ b/bin/emaint
@@ -423,7 +423,7 @@ class VdbKeyHandler(object):
 	name = staticmethod(name)
 
 	def __init__(self):
-		self.list = portage.db["/"]["vartree"].dbapi.cpv_all()
+		self.list = portage.db[portage.settings["EROOT"]]["vartree"].dbapi.cpv_all()
 		self.missing = []
 		self.keys = ["HOMEPAGE", "SRC_URI", "KEYWORDS", "DESCRIPTION"]
 		

diff --git a/bin/repoman b/bin/repoman
index 8adccc7..2099241 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -574,9 +574,9 @@ repoman_settings['PORTDIR_OVERLAY'] = "%s %s" % \
 repoman_settings = portage.config(local_config=False, _eprefix=eprefix,
 	env=dict(os.environ, PORTDIR_OVERLAY=repoman_settings['PORTDIR_OVERLAY']))
 
-root = '/'
+root = repoman_settings['EROOT']
 trees = {
-	root : {'porttree' : portage.portagetree(root, settings=repoman_settings)}
+	root : {'porttree' : portage.portagetree(settings=repoman_settings)}
 }
 portdb = trees[root]['porttree'].dbapi
 
@@ -2021,7 +2021,7 @@ for x in effective_scanlist:
 					xcache.update(shared_xmatch_caches)
 					arch_xmatch_caches[xmatch_cache_key] = xcache
 
-				trees["/"]["porttree"].settings = dep_settings
+				trees[root]["porttree"].settings = dep_settings
 				portdb.settings = dep_settings
 				portdb.xcache = xcache
 				# for package.use.mask support inside dep_check

diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py
index 01d5021..0866673 100644
--- a/pym/portage/dep/dep_check.py
+++ b/pym/portage/dep/dep_check.py
@@ -539,8 +539,12 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None):
 	assert(False) # This point should not be reachable
 
 def dep_check(depstring, mydbapi, mysettings, use="yes", mode=None, myuse=None,
-	use_cache=1, use_binaries=0, myroot="/", trees=None):
-	"""Takes a depend string and parses the condition."""
+	use_cache=1, use_binaries=0, myroot=None, trees=None):
+	"""
+	Takes a depend string, parses it, and selects atoms.
+	The myroot parameter is unused (use mysettings['EROOT'] instead).
+	"""
+	myroot = mysettings['EROOT']
 	edebug = mysettings.get("PORTAGE_DEBUG", None) == "1"
 	#check_config_instance(mysettings)
 	if trees is None: