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

[Jeremy Katz]

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

New commits:
commit ac87ad138493036b6dbfec4cbfabf9daa3313f81
Author: Jeremy Katz <katzj at redhat.com>
Date:   Wed Sep 12 10:41:20 2007 -0400

    event() only takes one argument

diff --git a/yum/__init__.py b/yum/__init__.py
index 39121e2..de4f1ca 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -2222,7 +2222,7 @@ class YumBase(depsolve.Depsolve):
         if len(dlpkgs) == 0:
             return None
         # make callback with packages to download                                    
-        callback.event(callbacks.PT_DOWNLOAD_PKGS,dlpkgs)    
+        callback.event(callbacks.PT_DOWNLOAD_PKGS)
         try:
             probs = self.downloadPkgs(dlpkgs)
 
commit ae1618ec6ab66beef49c3d27ac0083c4115bd8cb
Author: Jeremy Katz <katzj at redhat.com>
Date:   Wed Sep 12 10:40:12 2007 -0400

    allow passing in an already created display object

diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py
index ecddce1..f77400e 100644
--- a/yum/rpmtrans.py
+++ b/yum/rpmtrans.py
@@ -115,7 +115,10 @@ class SimpleCliCallBack(RPMBaseCallback):
 
 class RPMTransaction:
     def __init__(self, base, test=False, display=NoOutputCallBack):
-        self.display = display() # display callback
+        if not callable(display):
+            self.display = display
+        else:
+            self.display = display() # display callback
         self.base = base # base yum object b/c we need so much
         self.test = test # are we a test?