[packages/yum] fix "yum info FHS" throwing exception as the size is NULL

glen glen at pld-linux.org
Sat Apr 27 22:23:27 CEST 2013


commit 7bb2d2f27e5e9c4a76bdfb529f758f1b43440e06
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Apr 27 23:22:58 2013 +0300

    fix "yum info FHS" throwing exception as the size is NULL

 yum-info-no-size.patch | 11 +++++++++++
 yum.spec               |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/yum.spec b/yum.spec
index e0a162b..edad6d1 100644
--- a/yum.spec
+++ b/yum.spec
@@ -8,7 +8,7 @@ Summary:	RPM installer/updater
 Summary(pl.UTF-8):	Narzędzie do instalowania/uaktualniania pakietów RPM
 Name:		yum
 Version:	3.4.3
-Release:	5.7
+Release:	5.8
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -29,6 +29,7 @@ Patch9:		pld-release.patch
 Patch10:	rpm5-%{name}.patch
 Patch11:	rpm5-caps.patch
 Patch12:	%{name}-missingok.patch
+Patch13:	%{name}-info-no-size.patch
 # fc
 Patch100:	%{name}-HEAD.patch
 # Patch100-md5:	fed00a3fcdb2ab0115bf8e1949309763
@@ -109,6 +110,7 @@ bash-completion for Yum.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 %{__make}
diff --git a/yum-info-no-size.patch b/yum-info-no-size.patch
new file mode 100644
index 0000000..2d9dbec
--- /dev/null
+++ b/yum-info-no-size.patch
@@ -0,0 +1,11 @@
+--- yum-3.4.3/output.py	2013-04-27 22:42:25.241826823 +0300
++++ yum-3.4.3/output.py	2013-04-27 23:10:51.000000000 +0300
+@@ -819,7 +819,7 @@
+             print _("Epoch       : %s") % to_unicode(pkg.epoch)
+         print _("Version     : %s") % to_unicode(pkg.version)
+         print _("Release     : %s") % to_unicode(pkg.release)
+-        print _("Size        : %s") % self.format_number(float(pkg.size))
++        print _("Size        : %s") % self.format_number(float(pkg.size if pkg.size else 0))
+         print _("Repo        : %s") % to_unicode(pkg.repo.ui_id)
+         if pkg.repoid == 'installed' and 'from_repo' in pkg.yumdb_info:
+             print _("From repo   : %s") % to_unicode(pkg.yumdb_info.from_repo)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/yum.git/commitdiff/7bb2d2f27e5e9c4a76bdfb529f758f1b43440e06



More information about the pld-cvs-commit mailing list