[yum-commits] 2 commits - plugins/local reposync.py

[zpavlas at osuosl.org]

 plugins/local/local.py |    2 +-
 reposync.py            |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 93f8bd83fafe6043a60547be84b2ca9caf88b0e9
Author: Zdeněk Pavlas <zpavlas at redhat.com>
Date:   Mon Sep 3 12:57:13 2012 +0200

    unlink_f(cachecookie). BZ 853632
    
    I was not able to reproduce this, however the fix is simple.
    The _local repo is enabled, so cachecookie should by there.
    Perhaps something calls postdownload_hook twice?

diff --git a/plugins/local/local.py b/plugins/local/local.py
index c45a1ce..cab69c5 100644
--- a/plugins/local/local.py
+++ b/plugins/local/local.py
@@ -146,7 +146,7 @@ def _reposetup(conduit):
              if repo.id == "_local"]
     if lrepo:
         lrepo = lrepo[0]
-        os.unlink("%s/cachecookie" % lrepo.cachedir)
+        yum.misc.unlink_f("%s/cachecookie" % lrepo.cachedir)
         return
 
     conf_fname = '/etc/yum.repos.d/_local.repo'
commit 11225e8c7b50c0c81818eb65cb57ce5bde717ad9
Author: Zdeněk Pavlas <zpavlas at redhat.com>
Date:   Tue Aug 28 09:21:51 2012 +0200

    Initialize multi progress bar
    
    Contrary to yumdownloader, reposync does not use YumUtilBase.
    This needs recent Yum to work.

diff --git a/reposync.py b/reposync.py
index ad4e441..f868594 100755
--- a/reposync.py
+++ b/reposync.py
@@ -47,7 +47,7 @@ from yum.constants import *
 from yum.packageSack import ListPackageSack
 import rpmUtils.arch
 import logging
-from urlgrabber.progress import TextMeter
+from urlgrabber.progress import TextMeter, TextMultiFileMeter
 import urlgrabber
 
 # for yum 2.4.X compat
@@ -165,7 +165,7 @@ def main():
     #  Use progress bar display when downloading repo metadata
     # and package files ... needs to be setup before .repos (ie. RHN/etc.).
     if not opts.quiet:
-        my.repos.setProgressBar(TextMeter(fo=sys.stdout))
+        my.repos.setProgressBar(TextMeter(fo=sys.stdout), TextMultiFileMeter(fo=sys.stdout))
     my.doRepoSetup()
 
     if len(opts.repoid) > 0: