rpms/yum-arch/F-11 yum-arch-python26.patch, NONE, 1.1 yum-arch.spec, 1.4, 1.5

[Remi Collet]

Author: remi

Update of /cvs/extras/rpms/yum-arch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9532

Modified Files:
	yum-arch.spec 
Added Files:
	yum-arch-python26.patch 
Log Message:
fix python 2.6 issue (with is a reserved keyword)

yum-arch-python26.patch:

--- NEW FILE yum-arch-python26.patch ---
diff -up yum-2.2.2/yum/depsolve.py.p26 yum-2.2.2/yum/depsolve.py
--- yum-2.2.2/yum/depsolve.py.p26	2009-05-16 19:34:02.000000000 +0200
+++ yum-2.2.2/yum/depsolve.py	2009-05-16 19:35:07.000000000 +0200
@@ -67,7 +67,7 @@ class Depsolve:
                     matched = 1
             if not matched:
                 self.log(2, 'Importing Additional filelist information for dependency resolution')
-                self.repos.populateSack(with='filelists')
+                self.repos.populateSack(mdtype='filelists')
                 
         pkgs = self.pkgSack.searchProvides(name)
         if flags == 0:
diff -up yum-2.2.2/yum/__init__.py.p26 yum-2.2.2/yum/__init__.py
--- yum-2.2.2/yum/__init__.py.p26	2009-05-16 19:33:54.000000000 +0200
+++ yum-2.2.2/yum/__init__.py	2009-05-16 19:34:56.000000000 +0200
@@ -904,7 +904,7 @@ class YumBase(depsolve.Depsolve):
                     matched = 1
             if not matched:
                 self.log(2, 'Importing Additional filelist information for packages')
-                self.repos.populateSack(with='filelists')
+                self.repos.populateSack(mdtype='filelists')
 
         for arg in args:
             restring = self._refineSearchPattern(arg)
diff -up yum-2.2.2/yum/pgpmsg.py.p26 yum-2.2.2/yum/pgpmsg.py
diff -up yum-2.2.2/yum/repos.py.p26 yum-2.2.2/yum/repos.py
--- yum-2.2.2/yum/repos.py.p26	2009-05-16 19:34:10.000000000 +0200
+++ yum-2.2.2/yum/repos.py	2009-05-16 19:35:39.000000000 +0200
@@ -202,10 +202,10 @@ class RepoStorage:
             repo.setupGrab()
             
                 
-    def populateSack(self, which='enabled', with='metadata', callback=None, pickleonly=0):
+    def populateSack(self, which='enabled', mdtype='metadata', callback=None, pickleonly=0):
         """This populates the package sack from the repositories, two optional 
            arguments: which='repoid, enabled, all'
-                      with='metadata, filelists, otherdata, all'"""
+                      mdtype='metadata, filelists, otherdata, all'"""
 
         if not callback:
             callback = self.callback
@@ -223,10 +223,10 @@ class RepoStorage:
                 repobj = self.getRepo(which)
                 myrepos.append(repobj)
 
-        if with == 'all':
+        if mdtype == 'all':
             data = ['metadata', 'filelists', 'otherdata']
         else:
-            data = [ with ]
+            data = [ mdtype ]
         
         for repo in myrepos:
             if not hasattr(repo, 'cacheHandler'):


Index: yum-arch.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-arch/F-11/yum-arch.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- yum-arch.spec	25 Feb 2009 18:21:35 -0000	1.4
+++ yum-arch.spec	16 May 2009 19:06:40 -0000	1.5
@@ -1,11 +1,13 @@
 Summary:  Extract headers from rpm in a old yum repository
 Name:     yum-arch
 Version:  2.2.2
-Release:  5%{?dist}
+Release:  6%{?dist}
 License:  GPLv2+
 Group:    System Environment/Base
 Source0:  http://linux.duke.edu/projects/yum/download/2.2/yum-%{version}.tar.gz
 Patch1:   yum-arch-folder.patch
+Patch2:   yum-arch-python26.patch
+
 URL:      http://linux.duke.edu/yum/
 
 BuildArch: noarch
@@ -24,6 +26,7 @@ and RedHat Enterprise Linux < 4.
 %prep
 %setup -q -n yum-%{version}
 %patch1 -p0 -b .folder
+%patch2 -p1 -b .p26
 
 # to avoid rpmlint warnings
 for source in *.py {repomd,rpmUtils,yum}/*.py; do
@@ -49,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/%{name}*
 
 %changelog
+* Sat May 16 2009 Remi Collet <Fedora at FamilleCollet.com> - 2.2.2-6
+- fix python 2.6 issue
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild