[yum-commits] 2 commits - repoclosure.py

[skvidal at osuosl.org]

 repoclosure.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 528d8da78a6350d9b1080a1c3e4b00dde258dd7b
Merge: 92ea5b3... 49db414...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Aug 10 10:15:54 2010 -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:
      Don't display 0: for epoch, on installed kernels security warning
      Choose the sub-command more intelligently, depending on the args. (or lack)
      Display multiple certs, on newer yums ... almost certainly not though

commit 92ea5b33601015d9b2fb009f5ebd2aac6b6dd2df
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Aug 10 10:13:20 2010 -0400

    fix the url-based repofrompaths with repoclosure from having the wrong
    prefix prepended to them
    closes rh bug 622710

diff --git a/repoclosure.py b/repoclosure.py
index df80559..53ca63d 100755
--- a/repoclosure.py
+++ b/repoclosure.py
@@ -216,11 +216,11 @@ def main():
         # setup the fake repos
         for repo in opts.repofrompath:
             repoid,repopath = tuple(repo.split(','))
-            repopath = os.path.abspath(repopath)
-            if repopath[0] == '/':
-                baseurl = 'file://' + repopath
-            else:
+            if repopath.startswith('http') or repopath.startswith('ftp') or repopath.startswith('file:'):
                 baseurl = repopath
+            else:
+                repopath = os.path.abspath(repopath)                
+                baseurl = 'file://' + repopath
                 
             newrepo = yum.yumRepo.YumRepository(repoid)
             newrepo.name = repopath