[yum-commits] 2 commits - completion-helper.py yum/__init__.py

[zpavlas at osuosl.org]

 completion-helper.py |    2 ++
 yum/__init__.py      |    3 +++
 2 files changed, 5 insertions(+)

New commits:
commit 6351d7bbb6957e7c739a674696fcc5d7d31ecb17
Author: Zdeněk Pavlas <zpavlas at redhat.com>
Date:   Wed Apr 4 13:36:36 2012 +0200

    completion-helper: skip unavailable repos.  BZ 809469.
    
    completion-helper uses --cacheonly option to avoid metadata
    download, so new (or cleaned up) repos raise exceptions.
    
    We work this around by setting skip_if_unavailable=1 on all
    enabled repositories.

diff --git a/completion-helper.py b/completion-helper.py
index e4164f7..2e95ced 100755
--- a/completion-helper.py
+++ b/completion-helper.py
@@ -74,6 +74,8 @@ def main(args):
     base.registerCommand(RepoListCompletionCommand())
     base.getOptionsConfig(args)
     base.parseCommands()
+    for repo in base.repos.listEnabled():
+        repo.skip_if_unavailable = True
     base.doCommands()
 
 if __name__ == "__main__":
commit cd407a5d21acca1685e4d3d965e1df50d60a54ec
Author: Zdeněk Pavlas <zpavlas at redhat.com>
Date:   Wed Apr 4 12:29:53 2012 +0200

    Check .repo file permissions.  BZ 809598.
    
    Sometimes, people add .repo files with perm=600.
    Report the problem but don't abort.

diff --git a/yum/__init__.py b/yum/__init__.py
index 82a9380..c9bc815 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -542,6 +542,9 @@ class YumBase(depsolve.Depsolve):
 
             if os.path.isdir(reposdir):
                 for repofn in sorted(glob.glob('%s/*.repo' % reposdir)):
+                    if not os.access(repofn, os.R_OK):
+                        self.logger.warning(_("Skipping unreadable repository %s"), repr(repofn))
+                        continue
                     thisrepo_age = os.stat(repofn)[8]
                     if thisrepo_age < repo_config_age:
                         thisrepo_age = repo_config_age