break freeze request: fix ticket 3469

[Matt_Domsch at Dell.com]

Ticket 3469 (https://fedorahosted.org/fedora-infrastructure/ticket/3469) notes that an extra / is present in the mirrorlist for files such as the EPEL GPG key.  This happens because the mirrorlist CGI is inserting an extra / in the path, when the file is in the "topdir" (e.g. pub/epel, pub/fedora/linux) of a given category.  This fix should prevent it from adding the extraneous / in such a case.

diff --git a/modules/hotfix/files/mirrormanager/mirrorlist_server.py b/modules/hotfix/files/mirrormanager/mirrorlist_server.py
index fb2ae29..605a121 100755
--- a/modules/hotfix/files/mirrormanager/mirrorlist_server.py
+++ b/modules/hotfix/files/mirrormanager/mirrorlist_server.py
@@ -366,7 +366,9 @@ def append_path(hosts, cache, file, pathIsDirectory=False):
             if file is None and pathIsDirectory:
                 s += "/"
             if file is not None:
-                s += "/" + file
+                if not s.endswidth('/'):
+                    s += "/"
+                s += file
             hcurls.append(s)
         results.append((hostid, hcurls))
     return results


--
Matt Domsch
Technology Strategist
Dell | Office of the CTO
[cid:image001.jpg at 01CDDE3F.54A640A0]<https://cloudconsole.dell.com/Online/Signup/Products/>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.fedoraproject.org/pipermail/infrastructure/attachments/20121219/91a58957/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: image001.jpg
Type: image/jpeg
Size: 2931 bytes
Desc: image001.jpg
URL: <http://lists.fedoraproject.org/pipermail/infrastructure/attachments/20121219/91a58957/attachment.jpg>