Fix joining repository URLs together

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/repository.py b/src/buildservice/repository.py
index 7f9e67e2a4d866856e46ab42f0688a29e6bfc617..0f6326659e9b547d1a0fc4564f3ff0e361187f48 100644 (file)
--- a/src/buildservice/repository.py
+++ b/src/buildservice/repository.py
@@ -151,10 +151,10 @@ class Repository(base.DataObject):
 
        @property
        def basepath(self):
-               return "/".join((
+               return os.path.join(
                        self.distro.identifier,
                        self.identifier,
-               ))
+               )
 
        @property
        def path(self):
@@ -162,20 +162,20 @@ class Repository(base.DataObject):
 
        @property
        def url(self):
-               return os.path.join(
+               return "/".join((
                        self.settings.get("baseurl", "https://pakfire.ipfire.org"),
                        "repositories",
                        self.basepath,
-               )
+               ))
 
        @property
        def mirrorlist(self):
-               return os.path.join(
+               return "/".join((
                        self.settings.get("baseurl", "https://pakfire.ipfire.org"),
                        "distro", self.distro.identifier,
                        "repo", self.identifier,
                        "mirrorlist?arch=%{arch}"
-               )
+               ))
 
        def get_conf(self, local=False):
                lines = [

diff --git a/src/web/handlers.py b/src/web/handlers.py
index 0f5250b74aaa7347dc82f6bcf4d041be177013e4..dffaa484727309bdf5baa0552cb6da64721ec749 100644 (file)
--- a/src/web/handlers.py
+++ b/src/web/handlers.py
@@ -198,7 +198,7 @@ class RepositoryMirrorlistHandler(base.BaseHandler):
 
                # Always use the buildservice itself as last resort
                mirrors.append({
-                       "url" : repo.url,
+                       "url" : "/".join((repo.url, arch)),
                })
 
                ret["mirrors"] = mirrors