Merge branch 'master' into production

mozilla · Apr 17, 2015 · c6a6377 · c6a6377
2 parents 09e9d97 + 6ad2e2e
commit c6a6377
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/mozharness/mozilla/tooltool.py b/mozharness/mozilla/tooltool.py
@@ -36,6 +36,10 @@ def tooltool_fetch(self, manifest, bootstrap_cmd=None,
 
         # get the tooltools servers from configuration
         default_urls = self.config['tooltool_servers']
+        # add slashes (bug 1155630)
+        def add_slash(url):
+            return url if url.endswith('/') else (url + '/')
+        default_urls = [add_slash(u) for u in default_urls]
         proxxy = Proxxy(self.config, self.log_obj)
         proxxy_urls = proxxy.get_proxies_and_urls(default_urls)