[yum-git] yum/depsolve.py yum/__init__.py

[Tim Lauridsen]

 yum/__init__.py |    2 +-
 yum/depsolve.py |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 6c2cc6c2e0facd1e54ee97edbcfb197dba6401cb
Author: Tim Lauridsen <tla at rasmil.dk>
Date:   Fri Jan 11 11:36:01 2008 +0100

    show releated errmsg when printing packages with problems, it dont make much sense, to write that foo has a depsolve problem with telling what the problem is :)'

diff --git a/yum/__init__.py b/yum/__init__.py
index 6499300..8652f08 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -599,7 +599,7 @@ class YumBase(depsolve.Depsolve):
             depTree = self._buildDepTree()
             startTs = set(self.tsInfo)
             toRemove = set()
-            for po,wpo in self.po_with_problems:
+            for po,wpo,err in self.po_with_problems:
                 # check if the problem is caused by a package in the transaction
                 if not self.tsInfo.exists(po.pkgtup):
                     if wpo:
diff --git a/yum/depsolve.py b/yum/depsolve.py
index bf661e5..d495f40 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -261,7 +261,7 @@ class Depsolve(object):
 
         # Check packages with problems
         if missingdep:
-            self.po_with_problems.add((po,self._working_po))
+            self.po_with_problems.add((po,self._working_po,errormsgs[-1]))
 
         return (CheckDeps, missingdep, errormsgs)
 
@@ -655,7 +655,7 @@ class Depsolve(object):
             self.verbose_logger.log(logginglevels.DEBUG_1, '%s conflicts: %s',
                 name, conf)
             if conflicts:
-                self.po_with_problems.add((requiringPo,None))
+                self.po_with_problems.add((requiringPo,None,errormsgs[-1]))
 
         return (CheckDeps, conflicts, errormsgs)
 
@@ -780,8 +780,9 @@ class Depsolve(object):
         self.tsInfo.changed = False
         if len(errors) > 0:
             errors = unique(errors)
-            for po,wpo in self.po_with_problems:
+            for po,wpo,err in self.po_with_problems:
                 self.verbose_logger.info("%s from %s has depsolving problems" % (po,po.repoid))
+                self.verbose_logger.info("  --> %s" % (err))
             return (1, errors)
 
         if len(self.tsInfo) > 0: