[yum-commits] 2 commits - cli.py yum/yumRepo.py

James Antill james at osuosl.org
Fri Aug 31 17:49:00 UTC 2012


 cli.py         |    3 +++
 yum/yumRepo.py |    3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 01c5f506bb7554d73e8d627b24ae646f161d272f
Author: James Antill <james at and.org>
Date:   Thu Aug 30 16:05:37 2012 -0400

    Don't do a statvfs() check for local repos. that aren't going to copy.

diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index bbcb2b8..f834aec 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -891,7 +891,8 @@ class YumRepository(Repository, config.RepoConf):
             except Errors.MediaError, e:
                 verbose_logger.log(logginglevels.DEBUG_2, "Error getting package from media; falling back to url %s" %(e,))
 
-        if size:
+        if size and (self.copy_local or not url or
+                     not (url.startswith("/") or url.startswith("file:"))):
             dirstat = os.statvfs(os.path.dirname(local))
             avail = dirstat.f_bavail * dirstat.f_bsize
             if avail < long(size):
commit e22d47cedce394d1d2cf85faad5ba3bfbed6f54d
Author: James Antill <james at and.org>
Date:   Thu Aug 30 15:11:15 2012 -0400

    Add show-duplicates alias, for repoquery compat.

diff --git a/cli.py b/cli.py
index c7d89a1..adc3516 100755
--- a/cli.py
+++ b/cli.py
@@ -2252,6 +2252,9 @@ class YumOptionParser(OptionParser):
         group.add_option("--showduplicates", dest="showdupesfromrepos",
                         action="store_true",
                 help=_("show duplicates, in repos, in list/search commands"))
+        group.add_option("--show-duplicates", dest="showdupesfromrepos",
+                         action="store_true",
+                         help=SUPPRESS_HELP)
         group.add_option("-e", "--errorlevel", dest="errorlevel", default=None,
                 help=_("error output level"), type='int',
                 metavar='[error level]')


More information about the Yum-commits mailing list