rpms/yum/devel yum-3.2.20-listTrans-skip-broken.patch, NONE, 1.1 yum.spec, 1.225, 1.226

James Antill james at fedoraproject.org
Tue Oct 28 04:07:37 UTC 2008


Author: james

Update of /cvs/pkgs/rpms/yum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26869

Modified Files:
	yum.spec 
Added Files:
	yum-3.2.20-listTrans-skip-broken.patch 
Log Message:
* Mon Oct 27 2008 James Antill <james at fedoraproject.org> - 3.2.20-2
- Fix listTransaction for skipped packages.


yum-3.2.20-listTrans-skip-broken.patch:

--- NEW FILE yum-3.2.20-listTrans-skip-broken.patch ---
commit 5e405ec2e6651dc828c9b47075b6867a7e145536
Author: James Antill <james at and.org>
Date:   Mon Oct 27 23:59:37 2008 -0400

    Iterate skipped_packages properly as they are pos not txmbrs, fixes BZ 468785

diff --git a/output.py b/output.py
index 502aa4b..3c2795c 100644
--- a/output.py
+++ b/output.py
@@ -789,8 +789,7 @@ class YumOutput:
                             (_('Removing'), self.tsInfo.removed),
                             (_('Installing for dependencies'), self.tsInfo.depinstalled),
                             (_('Updating for dependencies'), self.tsInfo.depupdated),
-                            (_('Removing for dependencies'), self.tsInfo.depremoved),
-                            (_('Skipped (dependency problems)'), self.skipped_packages),]:
+                            (_('Removing for dependencies'), self.tsInfo.depremoved)]:
             lines = []
             for txmbr in pkglist:
                 (n,a,e,v,r) = txmbr.pkgtup
@@ -813,6 +812,30 @@ class YumOutput:
 
             pkglist_lines.append((action, lines))
 
+        for (action, pkglist) in [(_('Skipped (dependency problems)'),
+                                   self.skipped_packages),]:
+            lines = []
+            for po in pkglist:
+                (n,a,e,v,r) = po.pkgtup
+                evr = po.printVer()
+                repoid = po.repoid
+                pkgsize = float(po.size)
+                size = self.format_number(pkgsize)
+
+                if a is None: # gpgkeys are weird
+                    a = 'noarch'
+
+                lines.append((n, a, evr, repoid, size, []))
+                #  Create a dict of field_length => number of packages, for
+                # each field.
+                for (d, v) in (("n",len(n)), ("v",len(evr)), ("r",len(repoid))):
+                    data[d].setdefault(v, 0)
+                    data[d][v] += 1
+                if a_wid < len(a): # max() is only in 2.5.z
+                    a_wid = len(a)
+
+            pkglist_lines.append((action, lines))
+
         if data['n']:
             data    = [data['n'],    {}, data['v'], data['r'], {}]
             columns = [1,         a_wid,         1,         1,  5]


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- yum.spec	27 Oct 2008 20:45:57 -0000	1.225
+++ yum.spec	28 Oct 2008 04:07:06 -0000	1.226
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.20
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -14,6 +14,9 @@
 Patch2: yum-manpage-files.patch
 Patch3: yum-multilib-policy-best.patch
 
+# Patches from 3.2.X HEAD
+Patch101: yum-3.2.20-listTrans-skip-broken.patch
+
 URL: http://yum.baseurl.org/
 BuildArch: noarch
 BuildRequires: python
@@ -56,6 +59,8 @@
 %patch2 -p0
 %patch3 -p0
 
+%patch101 -p0
+
 %build
 make
 
@@ -103,6 +108,9 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Mon Oct 27 2008 James Antill <james at fedoraproject.org> - 3.2.20-2
+- Fix listTransaction for skipped packages.
+
 * Mon Oct 27 2008 Seth Vidal <skvidal at fedoraproject.org> - 3.2.20-1
 - 3.2.20
 




More information about the fedora-extras-commits mailing list