[yum-commits] 2 commits - reposync.py

skvidal at osuosl.org skvidal at osuosl.org
Wed Jul 8 18:36:13 UTC 2009


 reposync.py |   40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

New commits:
commit 6b93d1844eefdfcae7270f050e71e5a38e48e840
Merge: 6c5730d... 50cc1aa...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Jul 8 14:34:24 2009 -0400

    Merge branch 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum-utils
    
    * 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum-utils:
      [fastestmirror] Add a patch from Joel Michael to support a 'preferred' mirror (#509479)

commit 6c5730dfa8e04d3af097d776d60261d818d3e442
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Jul 8 14:33:21 2009 -0400

    fix for bug: https://bugzilla.redhat.com/show_bug.cgi?id=503587
     - make sure we don't fail to grab other metadata just b/c groups is not present

diff --git a/reposync.py b/reposync.py
index 5a8e87f..10df897 100755
--- a/reposync.py
+++ b/reposync.py
@@ -230,31 +230,37 @@ def main():
                 os.unlink(current_pkgs[pkg]['path'])
 
         if opts.downloadcomps or opts.downloadmd:
+
+            if not os.path.exists(local_repo_path):
+                try:
+                    os.makedirs(local_repo_path)
+                except IOError, e:
+                    my.logger.error("Could not make repo subdir: %s" % e)
+                    my.closeRpmDB()
+                    sys.exit(1)
             try: # download random other metadata
-                if not os.path.exists(local_repo_path):
-                    try:
-                        os.makedirs(local_repo_path)
-                    except IOError, e:
-                        my.logger.error("Could not make repo subdir: %s" % e)
-                        my.closeRpmDB()
-                        sys.exit(1)
                 if opts.downloadcomps:
                     compsfile = repo.getGroups()
                     shutil.copyfile(compsfile,"%s/%s" % (local_repo_path,'comps.xml'))
-                if opts.downloadmd:
-                    for ftype in repo.repoXML.fileTypes():
-                        if ftype in ['primary', 'primary_db', 'filelists',
-                                     'filelists_db', 'other', 'other_db']:
-                            continue
-                        if opts.downloadcomps and ftype == 'group':
-                            continue
-                        resultfile = repo.retrieveMD(ftype)
-                        basename  = os.path.basename(resultfile)
-                        shutil.copyfile(resultfile, "%s/%s" % (local_repo_path, basename))
             except yum.Errors.RepoMDError,e :
                 if not opts.quiet:
                     my.logger.error("Unable to fetch metadata: %s" % e)
 
+            if opts.downloadmd:
+                for ftype in repo.repoXML.fileTypes():
+                    if ftype in ['primary', 'primary_db', 'filelists',
+                                 'filelists_db', 'other', 'other_db']:
+                        continue
+                    if opts.downloadcomps and ftype == 'group':
+                        continue
+                    try:
+                        resultfile = repo.retrieveMD(ftype)
+                        basename  = os.path.basename(resultfile)
+                        shutil.copyfile(resultfile, "%s/%s" % (local_repo_path, basename))
+                    except yum.Errors.RepoMDError,e :
+                        if not opts.quiet:
+                            my.logger.error("Unable to fetch metadata: %s" % e)
+
         remote_size = 0
         local_size  = 0
         if not opts.urls:


More information about the Yum-commits mailing list