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

[James Antill]

 yum/yumRepo.py |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 6b31af648c435e01ce9a5f84796a81df9f3de959
Author: James Antill <james at and.org>
Date:   Wed Oct 22 01:37:22 2008 -0400

    Change fixed_repoid to timestamp_check, to make it more obvious wtf it does :)

diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index dfe0643..b762deb 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -272,11 +272,9 @@ class YumRepository(Repository, config.RepoConf):
         self.gpg_import_func = None
         self.confirm_func = None
 
-        #  Does this repoid "always" refer to the same repo. If true we
-        # can/should should do thing like the timestamp check, as we always
-        # want the newest data. If it isn't, then the timestamp might be "old"
-        # because we've just changed to an older/different repo.
-        self.fixed_repoid = True
+        #  The reason we want to turn this off are things like repoids
+        # called "tmp" in repoquery --repofrompath and/or new1/old1 in repodiff.
+        self.timestamp_check = True
 
         self._sack = None
 
@@ -992,7 +990,7 @@ class YumRepository(Repository, config.RepoConf):
             return True
         old_repo_XML = self._oldRepoMDData['old_repo_XML']
 
-        if (self.fixed_repoid and
+        if (self.timestamp_check and
             old_repo_XML.timestamp > self.repoXML.timestamp):
             logger.warning("Not using downloaded repomd.xml because it is "
                            "older than what we have:\n"
@@ -1068,7 +1066,7 @@ class YumRepository(Repository, config.RepoConf):
         # Get the latest metalink, and the latest repomd data from it
         repomd = self.metalink_data.repomd
 
-        if self.fixed_repoid and oxml.timestamp > repomd.timestamp:
+        if self.timestamp_check and oxml.timestamp > repomd.timestamp:
             #  We have something "newer" than the latest, and have timestamp
             # checking which will kill anything passing the metalink check.
             return True