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

[Seth Vidal]

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

New commits:
commit cb052258ce8270a321d81a99e878acc6b3d8a158
Merge: d57476f... 1922da9...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Mar 13 16:28:52 2008 -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:
      Add docs for group* command, and makecache
      Don't traceback if we can't read the mirrorlist (#428249)
      Fix proxy=http://foo:123 - bug#328121
      Support justdb as a tsflag (Dmitry Butskoy <dmitry at butskoy.name>, #394141)
      Updated German Translation by Fabian Affolter

commit d57476fe053ff5c8a1a74e3a7066b27f872a4182
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Mar 13 16:28:36 2008 -0400

    silence the log output when we hit a %pretrans or a %postrans.
    would be nice if rpm let us know where we were in the transaction, though.

diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py
index 91bf12c..7e40db2 100644
--- a/yum/rpmtrans.py
+++ b/yum/rpmtrans.py
@@ -222,11 +222,11 @@ class RPMTransaction:
         # make sure the package and the action make some kind of sense
         # write it out and pop(0) from the list
         
-        # make sure we have a list to work from - rpm seems to be throwing us
-        # some curveballs
+        # make sure we have a list to work from
         if len(self._te_tuples) == 0:
-            msg = 'extra callback for package %s in state %d' % (package, action)
-            self.display.filelog(package, msg)
+            # if we don't then this is pretrans or postrans or a trigger
+            # either way we have to respond correctly so just return and don't
+            # emit anything
             return
 
         (t,e,n,v,r,a) = self._te_tuples[0] # what we should be on