diff options
author | 2015-07-12 04:13:22 -0400 | |
---|---|---|
committer | 2015-07-12 04:13:22 -0400 | |
commit | 570ac7fff264e78cf8bd7333a946c7985945ba41 (patch) | |
tree | 8d8d23661ff7aaaaccc11e5b61d17fe86b94e192 | |
parent | pmerge: various repo handling simplifications (diff) | |
download | pkgcore-570ac7fff264e78cf8bd7333a946c7985945ba41.tar.gz pkgcore-570ac7fff264e78cf8bd7333a946c7985945ba41.tar.bz2 pkgcore-570ac7fff264e78cf8bd7333a946c7985945ba41.zip |
pmerge: revert several changes for methods requiring tuples
This fixes doing updates that works the resolver such as `pmerge -uD` or
similar.
-rw-r--r-- | pkgcore/scripts/pmerge.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgcore/scripts/pmerge.py b/pkgcore/scripts/pmerge.py index 2cd818b9..16aedcee 100644 --- a/pkgcore/scripts/pmerge.py +++ b/pkgcore/scripts/pmerge.py @@ -536,7 +536,7 @@ def main(options, out, err): # hp.setrelheap() resolver_inst = resolver_kls( - vdbs=installed_repos, dbs=source_repos, + vdbs=installed_repos.repos, dbs=source_repos.repos, verify_vdb=options.deep, nodeps=options.nodeps, drop_cycles=options.ignore_cycles, force_replace=options.replace, process_built_depends=options.with_bdeps, **extra_kwargs) @@ -578,14 +578,14 @@ def main(options, out, err): out.error("failed '%s'" % (restrict,)) out.write('potentials:') match_count = 0 - for r in repo_utils.get_raw_repos(source_repos): + for r in repo_utils.get_raw_repos(source_repos.repos): l = r.match(restrict) if l: out.write( "repo %s: [ %s ]" % (r, ", ".join(str(x) for x in l))) match_count += len(l) if not match_count: - out.write("No matches found in %s" % (source_repos,)) + out.write("No matches found in %s" % (source_repos.repos,)) out.write() if not options.ignore_failures: return 1 |