[yum-git] 2 commits - yum/misc.py yum/packages.py yum/yumRepo.py

[James Antill]

 yum/misc.py     |    2 +-
 yum/packages.py |    2 +-
 yum/yumRepo.py  |    5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 709d09e02b7dccc7abda8325bc803014aad52415
Author: James Antill <james at and.org>
Date:   Wed Feb 27 01:31:37 2008 -0500

    Don't do any repo MD work when in caching mode

diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index 8585510..e90981b 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -883,8 +883,10 @@ class YumRepository(Repository, config.RepoConf):
             return False
     
         if self._cachingRepoXML(local):
+            caching = True
             result = local
         else:
+            caching = False
             self._saveOldRepoXML(local)
                 
             result = self._getFileRepoXML(local, text)
@@ -901,6 +903,9 @@ class YumRepository(Repository, config.RepoConf):
             self._revertOldRepoXML()
             return False
 
+        if caching:
+            return False # Skip any work.
+
         if not self._groupCheckDataMDNewer():
             self._revertOldRepoXML()
             return False
commit 18900888ba60c3c64467a7e5cb18093d6425cd77
Author: James Antill <james at and.org>
Date:   Wed Feb 27 01:23:30 2008 -0500

    Use non-hacker name :)

diff --git a/yum/misc.py b/yum/misc.py
index 4ee1b63..336d621 100644
--- a/yum/misc.py
+++ b/yum/misc.py
@@ -98,7 +98,7 @@ def checksum(sumtype, file, CHUNK=2**16):
        sumtype = md5 or sha
        filename = /path/to/file
        CHUNK=65536 by default"""
-       
+     
     # chunking brazenly lifted from Ryan Tomayko
     try:
         if type(file) not in types.StringTypes:
diff --git a/yum/packages.py b/yum/packages.py
index 848bb58..6f1b6d6 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -890,7 +890,7 @@ class YumInstalledPackage(YumHeaderPackage):
 
             ftypes = []
             if flags & rpm.RPMFILE_CONFIG:
-                ftypes.append('config')
+                ftypes.append('configuration')
             if flags & rpm.RPMFILE_DOC:
                 ftypes.append('documentation')
             if flags & rpm.RPMFILE_GHOST: