[yum-cvs] 2 commits - yum/rpmtrans.py

[Seth Vidal]

 yum/rpmtrans.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 21d4e296f0593b2b87110408be8e29414dfe86e4
Merge: 118e372... 058e4c9...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Oct 8 10:10:16 2007 -0400

    Merge branch 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum
    
    * 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum:
      fix infinite loop with no repos enabled

commit 118e37217e89b07b0e48a4f46240d7c45274156b
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Oct 8 10:10:02 2007 -0400

    proper call to filelog to emit transaction logging errors

diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py
index fe293d1..52a1a7c 100644
--- a/yum/rpmtrans.py
+++ b/yum/rpmtrans.py
@@ -220,7 +220,7 @@ class RPMTransaction:
         # some curveballs
         if len(self._te_tuples) == 0:
             msg = 'extra callback for package %s in state %d' % (package, action)
-            self.display.filelog(msg)
+            self.display.filelog(package, msg)
             return
 
         (t,e,n,v,r,a) = self._te_tuples[0] # what we should be on
@@ -229,10 +229,10 @@ class RPMTransaction:
         msg = 'ts_done state is %s %s should be %s %s' % (package, action, t, n)
         if action in TS_REMOVE_STATES:
             if t != 'erase':
-                self.display.filelog(msg)
+                self.display.filelog(package, msg)
         if action in TS_INSTALL_STATES:
             if t != 'install':
-                self.display.filelog(msg)
+                self.display.filelog(package, msg)
                 
         # check the pkg name out to make sure it matches
         if type(package) in types.StringTypes:
@@ -242,7 +242,7 @@ class RPMTransaction:
         
         if n != name:
             msg = 'ts_done name in te is %s should be %s' % (n, package)
-            self.display.filelog(msg)
+            self.display.filelog(package, msg)
 
         # hope springs eternal that this isn't wrong
         msg = '%s %s:%s-%s-%s.%s\n' % (t,e,n,v,r,a)