Remove duplicated slashes from primary mirror

This patch removes any duplicated slashes in the primary mirror URL.

This patch fixes #272.

Signed-off-by: Daniel Braunwarth <[email protected]>
[remove inline changelog]
Reviewed-by: Bastian Germann <[email protected]>

Author: d4nuu8

elbepack/debinstaller.py

@@ -193,8 +193,9 @@ def get_primary_mirror(prj):
         m = prj.node("mirror")
 
         mirror = m.text("primary_proto") + "://"
-        mirror += m.text("primary_host") + "/"
-        mirror += m.text("primary_path")
+        mirror += "{}/{}".format(m.text("primary_host"),
+                                 m.text("primary_path")
+                                ).replace("//", "/")
     else:
         raise NoKinitrdException("Broken xml file: "
                                  "no cdrom and no primary host")

elbepack/elbexml.py

@@ -120,8 +120,9 @@ def get_initvm_primary_mirror(self, cdrompath):
             m = self.node("initvm/mirror")
 
             mirror = m.text("primary_proto") + "://"
-            mirror += m.text("primary_host") + "/"
-            mirror += m.text("primary_path")
+            mirror += "{}/{}".format(m.text("primary_host"),
+                                     m.text("primary_path")
+                                    ).replace("//", "/")
 
         elif self.xml.has("initvm/mirror/cdrom") and cdrompath:
             mirror = "file://%s" % cdrompath
@@ -136,8 +137,9 @@ def get_primary_mirror(self, cdrompath, initvm=True, hostsysroot=False):
                 mirror = m.text("host")
             else:
                 mirror = m.text("primary_proto") + "://"
-                mirror += m.text("primary_host") + "/"
-                mirror += m.text("primary_path")
+                mirror += "{}/{}".format(m.text("primary_host"),
+                                         m.text("primary_path")
+                                        ).replace("//", "/")
 
         elif self.prj.has("mirror/cdrom") and cdrompath:
             mirror = "file://%s" % cdrompath