|
|
03269df |
commit 5e405ec2e6651dc828c9b47075b6867a7e145536
|
|
|
03269df |
Author: James Antill <james@and.org>
|
|
|
03269df |
Date: Mon Oct 27 23:59:37 2008 -0400
|
|
|
03269df |
|
|
|
03269df |
Iterate skipped_packages properly as they are pos not txmbrs, fixes BZ 468785
|
|
|
03269df |
|
|
|
03269df |
diff --git a/output.py b/output.py
|
|
|
03269df |
index 502aa4b..3c2795c 100644
|
|
|
03269df |
--- a/output.py
|
|
|
03269df |
+++ b/output.py
|
|
|
03269df |
@@ -789,8 +789,7 @@ class YumOutput:
|
|
|
03269df |
(_('Removing'), self.tsInfo.removed),
|
|
|
03269df |
(_('Installing for dependencies'), self.tsInfo.depinstalled),
|
|
|
03269df |
(_('Updating for dependencies'), self.tsInfo.depupdated),
|
|
|
03269df |
- (_('Removing for dependencies'), self.tsInfo.depremoved),
|
|
|
03269df |
- (_('Skipped (dependency problems)'), self.skipped_packages),]:
|
|
|
03269df |
+ (_('Removing for dependencies'), self.tsInfo.depremoved)]:
|
|
|
03269df |
lines = []
|
|
|
03269df |
for txmbr in pkglist:
|
|
|
03269df |
(n,a,e,v,r) = txmbr.pkgtup
|
|
|
03269df |
@@ -813,6 +812,30 @@ class YumOutput:
|
|
|
03269df |
|
|
|
03269df |
pkglist_lines.append((action, lines))
|
|
|
03269df |
|
|
|
03269df |
+ for (action, pkglist) in [(_('Skipped (dependency problems)'),
|
|
|
03269df |
+ self.skipped_packages),]:
|
|
|
03269df |
+ lines = []
|
|
|
03269df |
+ for po in pkglist:
|
|
|
03269df |
+ (n,a,e,v,r) = po.pkgtup
|
|
|
03269df |
+ evr = po.printVer()
|
|
|
03269df |
+ repoid = po.repoid
|
|
|
03269df |
+ pkgsize = float(po.size)
|
|
|
03269df |
+ size = self.format_number(pkgsize)
|
|
|
03269df |
+
|
|
|
03269df |
+ if a is None: # gpgkeys are weird
|
|
|
03269df |
+ a = 'noarch'
|
|
|
03269df |
+
|
|
|
03269df |
+ lines.append((n, a, evr, repoid, size, []))
|
|
|
03269df |
+ # Create a dict of field_length => number of packages, for
|
|
|
03269df |
+ # each field.
|
|
|
03269df |
+ for (d, v) in (("n",len(n)), ("v",len(evr)), ("r",len(repoid))):
|
|
|
03269df |
+ data[d].setdefault(v, 0)
|
|
|
03269df |
+ data[d][v] += 1
|
|
|
03269df |
+ if a_wid < len(a): # max() is only in 2.5.z
|
|
|
03269df |
+ a_wid = len(a)
|
|
|
03269df |
+
|
|
|
03269df |
+ pkglist_lines.append((action, lines))
|
|
|
03269df |
+
|
|
|
03269df |
if data['n']:
|
|
|
03269df |
data = [data['n'], {}, data['v'], data['r'], {}]
|
|
|
03269df |
columns = [1, a_wid, 1, 1, 5]
|