]> git.ipfire.org Git - pakfire.git/commitdiff
Fix some problems with new sat solver code.
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 13 Mar 2012 18:56:25 +0000 (19:56 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 13 Mar 2012 18:56:25 +0000 (19:56 +0100)
python/pakfire/satsolver.py

index c1da1717dd5d5d77f08d4db1d12a2e1480bc61c6..c3629cee82474ccd7543aa8ca55969185bfab455 100644 (file)
@@ -26,6 +26,8 @@ log = logging.getLogger("pakfire")
 
 import _pakfire
 from _pakfire import *
+
+from constants import *
 from i18n import _
 
 import transaction
@@ -188,8 +190,8 @@ class Solver(object):
 
                # Configure the solver for an update.
                if self.get("update"):
-                       solver.set_updatesystem(True)
-                       solver.set_do_split_provides(True)
+                       self.solver.set_updatesystem(True)
+                       self.solver.set_do_split_provides(True)
 
                # Actually solve the request.
                start_time = time.time()
@@ -200,6 +202,9 @@ class Solver(object):
 
                self.logger.debug("Solver status: %s (%.2f ms)" % (self.status, self.time / 1000))
 
+               if self.status is False:
+                       raise DependencyError, self.get_problem_string()
+
        @property
        def transaction(self):
                if not self.status is True: