[yum-git] rpmUtils/transaction.py yum/__init__.py

[James Bowes]

 rpmUtils/transaction.py |    1 +
 yum/__init__.py         |   19 ++++---------------
 2 files changed, 5 insertions(+), 15 deletions(-)

New commits:
commit 6180a4ff5cae1703bc411cc5399811aa24cdc02f
Author: James Bowes <jbowes at redhat.com>
Date:   Mon Mar 17 08:50:50 2008 -0400

    Use rpm's problem set details to give arch information on bad transactions.
    
    Resolves rhbz #349091. Original patch from Panu.

diff --git a/rpmUtils/transaction.py b/rpmUtils/transaction.py
index 4f573e2..664643e 100644
--- a/rpmUtils/transaction.py
+++ b/rpmUtils/transaction.py
@@ -34,6 +34,7 @@ class TransactionWrapper:
                          'pgpImportPubkey',
                          'pgpPrtPkts',
                          'Debug',
+                         'problems',
                          'setFlags',
                          'setVSFlags',
                          'setProbFilter',
diff --git a/yum/__init__.py b/yum/__init__.py
index dd5fa44..b61c20e 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -2794,20 +2794,9 @@ class YumBase(depsolve.Depsolve):
         dscb = self.dsCallback
         self.dsCallback = None # dumb, dumb dumb dumb!
         self.populateTs(test=1)
-        deps = self.ts.check()
-        for deptuple in deps:
-            ((name, version, release), (needname, needversion), flags,
-              suggest, sense) = deptuple
-            if sense == rpm.RPMDEP_SENSE_REQUIRES:
-                msg = _('Package %s needs %s, this is not available.') % \
-                      (name, rpmUtils.miscutils.formatRequire(needname, 
-                                                              needversion, flags))
-                results.append(msg)
-            elif sense == rpm.RPMDEP_SENSE_CONFLICTS:
-                msg = _('Package %s conflicts with %s.') % \
-                      (name, rpmUtils.miscutils.formatRequire(needname, 
-                                                              needversion, flags))
-                results.append(msg)
+        self.ts.check()
+        for prob in self.ts.problems():
+            results.append(prob)
+
         self.dsCallback = dscb
         return results
-