rpms/yum-arch/EL-6 yum-arch-python26.patch, 1.2, 1.3 yum-arch.spec, 1.7, 1.8

Remi Collet remi at fedoraproject.org
Fri Jul 9 17:38:43 UTC 2010


Author: remi

Update of /cvs/pkgs/rpms/yum-arch/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13803

Modified Files:
	yum-arch-python26.patch yum-arch.spec 
Log Message:
improved patch from F-13

yum-arch-python26.patch:
 cli.py               |    8 ++++----
 rpmUtils/oldUtils.py |    5 ++++-
 yum/__init__.py      |    2 +-
 yum/depsolve.py      |    2 +-
 yum/pgpmsg.py        |    9 +++++++--
 yum/repos.py         |    8 ++++----
 6 files changed, 21 insertions(+), 13 deletions(-)

Index: yum-arch-python26.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yum-arch/EL-6/yum-arch-python26.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- yum-arch-python26.patch	26 Sep 2009 13:55:32 -0000	1.2
+++ yum-arch-python26.patch	9 Jul 2010 17:38:43 -0000	1.3
@@ -91,3 +91,27 @@ diff -up yum-2.2.2/yum/repos.py.p26 yum-
              s.update(self.pkttag)
              s.update(struct.pack(">H", pkt_len))
              s.update(msg[idx_save:idx_save+pkt_len])
+--- yum-2.2.2/cli.py.p26	2010-02-14 08:00:21.000000000 +0100
++++ yum-2.2.2/cli.py	2010-02-14 08:00:59.000000000 +0100
+@@ -491,7 +491,7 @@
+                             needrepos.append(po.repoid)
+ 
+                     self.log(2, 'Importing Changelog Metadata')
+-                    self.repos.populateSack(with='otherdata', which=needrepos)
++                    self.repos.populateSack(mdtype='otherdata', which=needrepos)
+                     self.log(2, 'Generating RSS File for %s' % pkgtype)
+                         
+                     self.listPkgs(this_pkg_list, titles[pkgtype], outputType='rss')
+@@ -602,9 +602,9 @@
+             self.log(3, '%s' % self.pickleRecipe())
+             try:
+                 self.doRepoSetup(nosack=1)
+-                self.repos.populateSack(with='metadata', pickleonly=1)
+-                self.repos.populateSack(with='filelists', pickleonly=1)
+-                self.repos.populateSack(with='otherdata', pickleonly=1)
++                self.repos.populateSack(mdtype='metadata', pickleonly=1)
++                self.repos.populateSack(mdtype='filelists', pickleonly=1)
++                self.repos.populateSack(mdtype='otherdata', pickleonly=1)
+                 
+             except yum.Errors.YumBaseError, e:
+                 return 1, [str(e)]


Index: yum-arch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-arch/EL-6/yum-arch.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- yum-arch.spec	26 Sep 2009 13:55:32 -0000	1.7
+++ yum-arch.spec	9 Jul 2010 17:38:43 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:  Extract headers from rpm in a old yum repository
 Name:     yum-arch
 Version:  2.2.2
-Release:  8%{?dist}
+Release:  9%{?dist}
 License:  GPLv2+
 Group:    System Environment/Base
 Source0:  http://linux.duke.edu/projects/yum/download/2.2/yum-%{version}.tar.gz
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/%{name}*
 
 %changelog
+* Sun Feb 14 2010 Remi Collet <Fedora at FamilleCollet.com> - 2.2.2-9
+- improve python 2.6 patch (fix FTBFS #564994)
+
 * Sat Sep 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 2.2.2-8
 - fix python 2.6 warnings (#521869)
 



More information about the scm-commits mailing list