[yum-commits] Branch 'yum-3_2_X' - 2 commits - output.py yum/yumRepo.py

[James Antill]

 output.py      |    4 ++--
 yum/yumRepo.py |    9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 510e9d47f9e5892a22f634fecbc5578fc7bd4d5c
Author: James Antill <james at and.org>
Date:   Mon Feb 9 12:25:23 2009 -0500

    Don't consider repomd.xml current if metalink.xml doesn't exist

diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index a1f4550..d177886 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -797,12 +797,17 @@ class YumRepository(Repository, config.RepoConf):
         else return False. This result is cached, so that metalink/repomd.xml
         are synchronized."""
         if self._metadataCurrent is None:
+            mlfn = self.cachedir + '/' + 'metalink.xml'
+            if self.metalink and not os.path.exists(mlfn):
+                self._metadataCurrent = False
+        if self._metadataCurrent is None:
             self._metadataCurrent = self.withinCacheAge(self.metadata_cookie,
                                                         self.metadata_expire)
         return self._metadataCurrent
 
-    #  The problem is that the metalink _cannot_ be newer than the repomd.xml
-    # or the checksums can be off.
+    #  The metalink _shouldn't_ be newer than the repomd.xml or the checksums
+    # will be off, but we only really care when we are downloading the
+    # repomd.xml ... so keep it in mind that they can be off on disk.
     #  Also see _getMetalink()
     def _metalinkCurrent(self):
         if self._metadataCurrent is not None:
commit 54603813216013160c86ae5afe4df362f2d8750a
Author: James Antill <james at and.org>
Date:   Fri Feb 6 15:58:03 2009 -0500

    Allow "two" to be translated, trac#34

diff --git a/output.py b/output.py
index a582fd1..74081d3 100755
--- a/output.py
+++ b/output.py
@@ -1082,8 +1082,8 @@ Remove   %5.5s Package(s)
 
         @param cbobj: urlgrabber callback obj
         '''
-        delta_exit_chk = 2.0   # Delta between C-c's so we treat as exit
-        delta_exit_str = "two" # Human readable version of above
+        delta_exit_chk = 2.0      # Delta between C-c's so we treat as exit
+        delta_exit_str = _("two") # Human readable version of above
 
         now = time.time()