[yum-cvs] 2 commits - yum/__init__.py yum/yumRepo.py

[Jeremy Katz]

 yum/__init__.py |    5 ++++-
 yum/yumRepo.py  |    7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 80bff653f2361bb10f05ac571a6fcec2f7c42405
Author: Jeremy Katz <katzj at redhat.com>
Date:   Tue Sep 18 13:23:04 2007 -0400

    make metadata_expire=-1 to imply "never expire"

diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index 009df2d..56715e0 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -666,6 +666,9 @@ class YumRepository(Repository, config.RepoConf):
            file. If any of them are newer then invalidate the cache
            """
 
+        # -1 is special and should never get refreshed
+        if expiration_time == -1 and os.path.exists(myfile):
+            return True
         val = False
         if os.path.exists(myfile):
             cookie_info = os.stat(myfile)
commit 78a046251149b0b65d01bbff2c79b052d127d9a2
Author: Jeremy Katz <katzj at redhat.com>
Date:   Tue Sep 18 13:00:00 2007 -0400

    for frontends which aren't media-aware (ie, don't provide a mediafunc for
    grabbing packages from media), disable any media-only repositories

diff --git a/yum/__init__.py b/yum/__init__.py
index eeeb51e..3d48a70 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -365,7 +365,7 @@ class YumBase(depsolve.Depsolve):
             return self._pkgSack
         
         if thisrepo is None:
-            repos = self.repos.listEnabled()
+            repos = 'enabled'
         else:
             repos = self.repos.findRepos(thisrepo)
         
@@ -384,6 +384,9 @@ class YumBase(depsolve.Depsolve):
         self.excludePackages()
         self._pkgSack.excludeArchs(archlist)
         
+        #FIXME - this could be faster, too.
+        if repos == 'enabled':
+            repos = self.repos.listEnabled()
         for repo in repos:
             self.excludePackages(repo)
             self.includePackages(repo)
diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index c743220..009df2d 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -702,7 +702,9 @@ class YumRepository(Repository, config.RepoConf):
             self.dirSetup()
         except Errors.RepoError, e:
             raise
-
+        if not self.mediafunc and self.mediaid and not self.mirrorlist and not self.baseurl:
+            verbose_logger.log(logginglevels.DEBUG_2, "Disabling media repo for non-media-aware frontend")
+            self.enabled = False
 
     def _loadRepoXML(self, text=None):
         """retrieve/check/read in repomd.xml from the repository"""