aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-10-27 18:17:55 -0700
committerZac Medico <zmedico@gentoo.org>2011-10-27 18:17:55 -0700
commit04463a130cadf6eadcb2f49ba6026a248ea2c9c4 (patch)
tree55d22933d4dd8e1648d621ad24bc2c0b68e6045e /pym/portage/dep
parentcreate_trees: ensure trees is _trees_dict type (diff)
downloadportage-04463a130cadf6eadcb2f49ba6026a248ea2c9c4.tar.gz
portage-04463a130cadf6eadcb2f49ba6026a248ea2c9c4.tar.bz2
portage-04463a130cadf6eadcb2f49ba6026a248ea2c9c4.zip
Fix missed ROOT -> EROOT changes.
These go along with commit a715b65f7bd36409c1283e6911265d1f4405ab7a.
Diffstat (limited to 'pym/portage/dep')
-rw-r--r--pym/portage/dep/dep_check.py8
1 files changed, 6 insertions, 2 deletions
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: