From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 1 Nov 2017 20:52:38 +0000 (+0000)
Subject: Fix joining repository URLs together
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c025f7b07589b34b2ec232397f6e7d86d393089;p=pbs.git

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 7f9e67e2..0f632665 100644
--- 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 0f5250b7..dffaa484 100644
--- 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