diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-09-27 15:41:14 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-09-27 15:41:14 +0000 |
| commit | dc89bb2fddd59da70d8843dd0d5f2e9b26c7d702 (patch) | |
| tree | 4e9b82b8d361e2d56e0db8138a938ad295a12742 | |
| parent | 8c0b34688d01699cf43147645ea6e12282f21471 (diff) | |
| download | portage-dc89bb2fddd59da70d8843dd0d5f2e9b26c7d702.tar.gz portage-dc89bb2fddd59da70d8843dd0d5f2e9b26c7d702.tar.bz2 portage-dc89bb2fddd59da70d8843dd0d5f2e9b26c7d702.zip | |
Revert dep_zapdeps fakedbapi usage as per comment #31 on bug #147766.
svn path=/main/trunk/; revision=4542
| -rw-r--r-- | pym/portage.py | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/pym/portage.py b/pym/portage.py index 474be3b84..fa307af36 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -3367,7 +3367,7 @@ def dep_eval(deplist): return 1 def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None, - fakedb=None, return_all_deps=False): + return_all_deps=False): """Takes an unreduced and reduced deplist and removes satisfied dependencies. Returned deplist contains steps that must be taken to satisfy dependencies.""" if trees is None: @@ -3384,7 +3384,7 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None, if isinstance(dep, list): unresolved += dep_zapdeps(dep, satisfied, myroot, use_binaries=use_binaries, trees=trees, - fakedb=fakedb, return_all_deps=return_all_deps) + return_all_deps=return_all_deps) elif not satisfied or return_all_deps: unresolved.append(dep) return unresolved @@ -3403,10 +3403,7 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None, other = [] # Alias the trees we'll be checking availability against - if fakedb: - vardb = fakedb - else: - vardb = trees[myroot]["vartree"].dbapi + vardb = trees[myroot]["vartree"].dbapi if use_binaries: mydbapi = trees[myroot]["bintree"].dbapi else: @@ -3418,7 +3415,7 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None, if isinstance(dep, list): atoms = dep_zapdeps(dep, satisfied, myroot, use_binaries=use_binaries, trees=trees, - fakedb=fakedb, return_all_deps=return_all_deps) + return_all_deps=return_all_deps) else: atoms = [dep] @@ -3559,12 +3556,9 @@ def dep_check(depstring, mydbapi, mysettings, use="yes", mode=None, myuse=None, writemsg("mysplit: %s\n" % (mysplit), 1) writemsg("mysplit2: %s\n" % (mysplit2), 1) - fakedb = None - if return_all_deps: - fakedb = mydbapi myzaps = dep_zapdeps(mysplit, mysplit2, myroot, use_binaries=use_binaries, trees=trees, - fakedb=fakedb, return_all_deps=return_all_deps) + return_all_deps=return_all_deps) mylist = flatten(myzaps) writemsg("myzaps: %s\n" % (myzaps), 1) writemsg("mylist: %s\n" % (mylist), 1) |