[Yum-devel] [PATCH 2/2] Nuke _check_uncompressed_db()

Zdeněk Pavlas zpavlas at redhat.com
Thu Nov 8 15:45:44 UTC 2012


---
 yum/yumRepo.py |   16 +---------------
 1 files changed, 1 insertions(+), 15 deletions(-)

diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index 4eb4697..9c8cf64 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -185,11 +185,7 @@ class YumPackageSack(packageSack.PackageSack):
                 #  Use gen decompression on DB files. Keeps exactly what we
                 # downloaded in the download dir.
 
-                # Backwards compat. ... try the old uncompressed version first.
-                db_un_fn = self._check_uncompressed_db(repo, mydbtype)
-                if not db_un_fn:
-                    db_un_fn = self._check_uncompressed_db_gen(repo, mydbtype)
-
+                db_un_fn = self._check_uncompressed_db_gen(repo, mydbtype)
                 if not db_un_fn:
                     db_fn = repo._retrieveMD(mydbtype)
                     if db_fn:
@@ -244,16 +240,6 @@ class YumPackageSack(packageSack.PackageSack):
             return self._check_uncompressed_db_fn(repo, mdtype, ret)
         return None
 
-    def _check_uncompressed_db(self, repo, mdtype):
-        """return file name of uncompressed db is good, None if not"""
-        mydbdata = repo.repoXML.getData(mdtype)
-        (r_base, remote) = mydbdata.location
-        fname = os.path.basename(remote)
-        compressed_fn = repo.cachedir + '/' + fname
-        db_un_fn = misc.decompress(compressed_fn, fn_only=True)
-
-        return self._check_uncompressed_db_fn(repo, mdtype, db_un_fn)
-
     def _check_uncompressed_db_fn(self, repo, mdtype, db_un_fn):
         result = None
 
-- 
1.7.4.4



More information about the Yum-devel mailing list