From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 13 Mar 2012 18:56:25 +0000 (+0100)
Subject: Fix some problems with new sat solver code.
X-Git-Tag: 0.9.21~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8137e894fb739e583737cbaee9637f94174e4c9d;p=pakfire.git

Fix some problems with new sat solver code.
---

diff --git a/python/pakfire/satsolver.py b/python/pakfire/satsolver.py
index c1da1717d..c3629cee8 100644
--- a/python/pakfire/satsolver.py
+++ b/python/pakfire/satsolver.py
@@ -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: