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'):
--- yum-2.2.2/rpmUtils/oldUtils.py.orig	2009-05-16 20:10:54.000000000 +0100
+++ yum-2.2.2/rpmUtils/oldUtils.py	2009-09-08 15:19:47.494521706 +0100
@@ -151,7 +151,10 @@
     def _write_gzip_header(self):
         self.fileobj.write('\037\213')             # magic header
         self.fileobj.write('\010')                 # compression method
-        fname = self.filename[:-3]
+        if self.name[-3:] != ".gz":
+            fname = self.name
+        else:
+            fname = self.name[:-3]
         flags = 0
         if fname:
             flags = FNAME
--- yum-2.2.2/yum/pgpmsg.py.orig	2009-05-16 20:10:54.000000000 +0100
+++ yum-2.2.2/yum/pgpmsg.py		2009-09-08 15:31:53.921273337 +0100
@@ -13,7 +13,12 @@
 ##You should have received a copy of the GNU General Public License
 ##along with this program; if not, write to the Free Software
 ##Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-import string, struct, time, cStringIO, base64, types, sha
+import string, struct, time, cStringIO, base64, types
+try:
+    from hashlib import sha1 as sha
+except:
+    from sha import new as sha
+
 
 debug = None
 
@@ -385,7 +390,7 @@
             #XXX do the v3 fingerprint here
         
         elif self.version == 4:
-            s = sha.new()
+            s = sha()
             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)]