From 569b3054be42bbe78e39c5cd55dffec4c4ec0b33 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 28 Oct 2012 10:33:00 +0100 Subject: [PATCH] Fix resolvdep command. --- python/pakfire/base.py | 6 ++++++ python/pakfire/cli.py | 5 +++-- python/pakfire/satsolver.py | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/python/pakfire/base.py b/python/pakfire/base.py index b8b316337..a9429ca3e 100644 --- a/python/pakfire/base.py +++ b/python/pakfire/base.py @@ -546,6 +546,12 @@ class Pakfire(object): return sorted(pkgs) + def resolvdep(self, pkg): + # Initialize this pakfire instance. + self.initialize() + + return self.pool.resolvdep(self, pkg) + def repo_list(self): # Initialize this pakfire instance. self.initialize() diff --git a/python/pakfire/cli.py b/python/pakfire/cli.py index e7da9ccb5..97a24d31e 100644 --- a/python/pakfire/cli.py +++ b/python/pakfire/cli.py @@ -353,13 +353,14 @@ class Cli(object): def handle_repolist(self): p = self.pakfire(**self.pakfire_args) + repos = p.repo_list() FORMAT = " %-20s %8s %12s %12s " title = FORMAT % (_("Repository"), _("Enabled"), _("Priority"), _("Packages")) print title print "=" * len(title) # spacing line - for repo in p.repo_list(): + for repo in repos: # Skip the installed repository. if repo.name == "installed": continue @@ -381,7 +382,7 @@ class Cli(object): (pkg,) = self.args.package - solver = p.pool.resolvdep(pkg) + solver = p.resolvdep(pkg) assert solver.status t = transaction.Transaction.from_solver(p, solver) diff --git a/python/pakfire/satsolver.py b/python/pakfire/satsolver.py index 1eadc07c8..1aaee7462 100644 --- a/python/pakfire/satsolver.py +++ b/python/pakfire/satsolver.py @@ -137,11 +137,11 @@ class Pool(_pakfire.Pool): return ret - def resolvdep(self, pkg, logger=None): + def resolvdep(self, pakfire, pkg, logger=None): assert os.path.exists(pkg) # Open the package file. - pkg = packages.open(self, None, pkg) + pkg = packages.open(pakfire, None, pkg) # Create a new request. request = self.create_request(install=pkg.requires) -- 2.39.5