From db6b4415da743cbc38a2fc24e93758e2bd5e65f6 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 31 Jul 2011 16:20:17 +0200 Subject: [PATCH] Fix logging of dependency errors to build log. --- pakfire/builder.py | 2 +- pakfire/satsolver.py | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pakfire/builder.py b/pakfire/builder.py index b530364d0..d8f12d21d 100644 --- a/pakfire/builder.py +++ b/pakfire/builder.py @@ -292,7 +292,7 @@ class Builder(object): solver = self.pakfire.create_solver() # Do the solving. - transaction = solver.solve(request, allow_downgrade=True) + transaction = solver.solve(request, allow_downgrade=True, logger=self.log) # XXX check for errors if not transaction: diff --git a/pakfire/satsolver.py b/pakfire/satsolver.py index a795fe0a1..f2f6060b3 100644 --- a/pakfire/satsolver.py +++ b/pakfire/satsolver.py @@ -78,7 +78,10 @@ class Solver(object): self.pool = pool def solve(self, request, update=False, uninstall=False, allow_downgrade=False, - interactive=False): + interactive=False, logger=None): + # If no logger was provided, we use the root logger. + if logger is None: + logger = logging.getLogger() # Create a new solver. solver = _pakfire.Solver(self.pool) @@ -94,7 +97,7 @@ class Solver(object): # Actually solve the request. res = solver.solve(request) - logging.debug("Solver status: %s" % res) + logger.debug("Solver status: %s" % res) # If the solver succeeded, we return the transaction and return. if res: @@ -106,8 +109,8 @@ class Solver(object): # Do the problem handling... problems = solver.get_problems(request) - logging.info("") - logging.info(_("The solver returned one problem:", "The solver returned %(num)s problems:", + logger.info("") + logger.info(_("The solver returned one problem:", "The solver returned %(num)s problems:", len(problems)) % { "num" : len(problems) }) i = 0 @@ -115,9 +118,9 @@ class Solver(object): i += 1 # Print information about the problem to the user. - logging.info(" #%d: %s" % (i, problem)) + logger.info(" #%d: %s" % (i, problem)) - logging.info("") + logger.info("") if not interactive: return False -- 2.39.5