diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-10-27 18:17:55 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-10-27 18:17:55 -0700 |
| commit | 04463a130cadf6eadcb2f49ba6026a248ea2c9c4 (patch) | |
| tree | 55d22933d4dd8e1648d621ad24bc2c0b68e6045e | |
| parent | db1db3b011546e99e5248cb5f292b584eba26f03 (diff) | |
| download | portage-04463a130cadf6eadcb2f49ba6026a248ea2c9c4.tar.gz portage-04463a130cadf6eadcb2f49ba6026a248ea2c9c4.tar.bz2 portage-04463a130cadf6eadcb2f49ba6026a248ea2c9c4.zip | |
Fix missed ROOT -> EROOT changes.
These go along with commit a715b65f7bd36409c1283e6911265d1f4405ab7a.
| -rwxr-xr-x | bin/emaint | 2 | ||||
| -rwxr-xr-x | bin/repoman | 6 | ||||
| -rw-r--r-- | pym/portage/dep/dep_check.py | 8 |
3 files changed, 10 insertions, 6 deletions
diff --git a/bin/emaint b/bin/emaint index ea26e5548..1bee0fe0b 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 8adccc774..2099241d9 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 01d502149..0866673c1 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: |