]> git.ipfire.org Git - pakfire.git/commitdiff
Fix resolvdep command.
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 28 Oct 2012 09:33:00 +0000 (10:33 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 28 Oct 2012 09:33:00 +0000 (10:33 +0100)
python/pakfire/base.py
python/pakfire/cli.py
python/pakfire/satsolver.py

index b8b3163377867c607c70c6b9df39e55bf77edd3c..a9429ca3e3e2d81bc25d2607346b82aaabf41a41 100644 (file)
@@ -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()
index e7da9ccb5e7c565f5eec291a8fd79c5cece03897..97a24d31ee493166fd3730941b470b9f89ed46d9 100644 (file)
@@ -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)
index 1eadc07c839b2027a7d49346f552cedf5d33e240..1aaee74624518862aeef3e0a05c3dc9627679d6d 100644 (file)
@@ -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)