devel/yum yum-trans-display-object.patch, NONE, 1.1 yum.spec, 1.177, 1.178 cli-ouput-fix.patch, 1.1, NONE depsolve-fixes.patch, 1.1, NONE rpmdb-unresolved.patch, 1.1, NONE version-None-tuple.patch, 1.1, NONE

Jeremy Katz (katzj) fedora-extras-commits at redhat.com
Wed Sep 12 14:55:38 UTC 2007


Author: katzj

Update of /cvs/pkgs/devel/yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18669

Modified Files:
	yum.spec 
Added Files:
	yum-trans-display-object.patch 
Removed Files:
	cli-ouput-fix.patch depsolve-fixes.patch 
	rpmdb-unresolved.patch version-None-tuple.patch 
Log Message:
* Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 3.2.5-2
- add upstream patch to improve RPMTransaction display


yum-trans-display-object.patch:

--- NEW FILE yum-trans-display-object.patch ---
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?
         


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/devel/yum/yum.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- yum.spec	10 Sep 2007 16:07:14 -0000	1.177
+++ yum.spec	12 Sep 2007 14:55:06 -0000	1.178
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Source2: yum-updatesd.conf.fedora
 Patch0: installonlyn-enable.patch
 Patch1: yum-showasdep.patch
+Patch2: yum-trans-display-object.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -48,6 +49,7 @@
 %setup -q
 %patch0 -p0 -b .installonly
 %patch1 -p1 -b .showdep
+%patch2 -p1 -b .transdisp
 
 %build
 make
@@ -93,6 +95,9 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 3.2.5-2
+- add upstream patch to improve RPMTransaction display
+
 * Mon Sep 10 2007 Seth Vidal <skvidal at fedoraproject.org> 3.2.5-1
 - 3.2.5 - pull out unused patches
 


--- cli-ouput-fix.patch DELETED ---


--- depsolve-fixes.patch DELETED ---


--- rpmdb-unresolved.patch DELETED ---


--- version-None-tuple.patch DELETED ---




More information about the scm-commits mailing list