[yum-cvs] 2 commits - reposync.py

Seth Vidal skvidal at linux.duke.edu
Wed Dec 12 16:18:33 UTC 2007


 reposync.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 98d2601d725acf287821ec5afa79b641adeacab6
Merge: 66b444f... 521653a...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Dec 12 11:17:13 2007 -0500

    Merge branch 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum-utils
    
    * 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum-utils:
      Move conduit.getPackages until needed, as it takes significant time

commit 66b444f26ff0712c393914a7d1a0d419117df4d8
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Dec 12 10:53:59 2007 -0500

    make sure that our repo url has a trailing /, otherwise urljoin does the wrong
    thing. We should probably append this higher up in the stack, too.
    
    closes rh bug: 421801

diff --git a/reposync.py b/reposync.py
index 2da58f3..1eaa2ce 100755
--- a/reposync.py
+++ b/reposync.py
@@ -222,7 +222,9 @@ def main():
                 continue
     
             if opts.urls:
-                url = urljoin(repo.urls[0],remote)
+                if repo.urls[0][-1] != '/':
+                    baseurl = repo.urls[0] + '/'
+                url = urljoin(baseurl,remote)
                 print '%s' % url
                 continue
     



More information about the Yum-cvs-commits mailing list