On Wed, 19 Dec 2012 23:19:44 -0600
<Matt_Domsch(a)Dell.com> wrote:
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
It looks pretty minor to me, so I'd be ok with trying it, but being
ready to back it out if it caused any issues. ;)
Is there any way to test it in staging first, at least to make sure it
doesn't cause the mirrorlist_server to crash or anything?
+1
kevin