[yum-git] 2 commits - yum/depsolve.py yum/packages.py

[Tim Lauridsen]

 yum/depsolve.py |   12 ++++++++----
 yum/packages.py |   18 +++++++++---------
 2 files changed, 17 insertions(+), 13 deletions(-)

New commits:
commit d552dc366913e45cce33335e8cd46ed05a6674fc
Author: Tim Lauridsen <tla at rasmil.dk>
Date:   Fri Jan 11 12:20:05 2008 +0100

    make the depsolver errors show the full package names & repo

diff --git a/yum/depsolve.py b/yum/depsolve.py
index d495f40..9a4a81b 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -404,8 +404,9 @@ class Depsolve(object):
             if self.pkgSack is None:
                 return self._requiringFromTransaction(requiringPo, requirement, errorlist)
             else:
+                prob_pkg = "%s (%s)" % (requiringPo,requiringPo.repoid)
                 msg = 'Unresolvable requirement %s for %s' % (niceformatneed,
-                                                               reqpkg[0])
+                                                               prob_pkg)
                 self.verbose_logger.log(logginglevels.DEBUG_2, msg)
                 checkdeps = 0
                 missingdep = 1
@@ -483,9 +484,10 @@ class Depsolve(object):
 
         if len(provSack) == 0: # unresolveable
             missingdep = 1
+            prob_pkg = "%s (%s)" % (requiringPo,requiringPo.repoid)
             msg = 'Missing Dependency: %s is needed by package %s' % \
             (rpmUtils.miscutils.formatRequire(needname, needversion, needflags),
-                                                                   name)
+                                                                   prob_pkg)
             errorlist.append(msg)
             return checkdeps, missingdep
         
@@ -550,7 +552,8 @@ class Depsolve(object):
         if self.rpmdb.contains(po=best): # is it already installed?
             missingdep = 1
             checkdeps = 0
-            msg = 'Missing Dependency: %s is needed by package %s' % (needname, name)
+            prob_pkg = "%s (%s)" % (requiringPo,requiringPo.repoid)
+            msg = 'Missing Dependency: %s is needed by package %s' % (needname, prob_pkg)
             errorlist.append(msg)
             return checkdeps, missingdep
         
@@ -651,7 +654,8 @@ class Depsolve(object):
             
         else:
             conf = rpmUtils.miscutils.formatRequire(needname, needversion, flags)
-            CheckDeps, conflicts = self._unresolveableConflict(conf, name, errormsgs)
+            prob_pkg = "%s (%s)" % (requiringPo,requiringPo.repoid)
+            CheckDeps, conflicts = self._unresolveableConflict(conf, prob_pkg, errormsgs)
             self.verbose_logger.log(logginglevels.DEBUG_1, '%s conflicts: %s',
                 name, conf)
             if conflicts:
commit e05737dffaf6d30e66f51a2b5983d3df83900ab6
Author: Tim Lauridsen <tla at rasmil.dk>
Date:   Fri Jan 11 12:54:20 2008 +0100

    make str(po) return foo-1.0-1.fc8.noarch, insted of foo - 1.0-1.fc8.noarch

diff --git a/yum/packages.py b/yum/packages.py
index 504c0e1..2b4c0fe 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -166,16 +166,16 @@ class PackageObject(object):
         
     def __str__(self):
         if self.epoch == '0':
-            out = '%s - %s-%s.%s' % (self.name, 
-                                     self.version,
-                                     self.release, 
-                                     self.arch)
+            out = '%s-%s-%s.%s' % (self.name, 
+                                   self.version,
+                                   self.release, 
+                                   self.arch)
         else:
-            out = '%s - %s:%s-%s.%s' % (self.name, 
-                                        self.epoch, 
-                                        self.version, 
-                                        self.release, 
-                                        self.arch)
+            out = '%s-%s:%s-%s.%s' % (self.name, 
+                                      self.epoch, 
+                                      self.version, 
+                                      self.release, 
+                                      self.arch)
         return out
 
     def returnSimple(self, varname):