From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 28 Jun 2022 10:44:27 +0000 (+0000)
Subject: packages: Generate a better download URL
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a414e97a7a3d2b6bcd4a7c8bc98f2e908b844fe6;p=pbs.git

packages: Generate a better download URL

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

diff --git a/src/buildservice/packages.py b/src/buildservice/packages.py
index 3e9b7fb9..38c31390 100644
--- a/src/buildservice/packages.py
+++ b/src/buildservice/packages.py
@@ -4,6 +4,7 @@ import datetime
 import logging
 import os
 import shutil
+import urllib.parse
 
 import pakfire
 
@@ -335,8 +336,17 @@ class Package(base.DataObject):
 
 	@property
 	def download_url(self):
-		# XXX ???
-		return self.path
+		# The base URL
+		baseurl = self.settings.get("baseurl")
+
+		# Path to package
+		path = os.path.join(
+			"files",
+			os.path.relpath(self.path, PAKFIRE_DIR),
+		)
+
+		# Join it all together
+		return urllib.parse.urljoin(baseurl, path)
 
 	@property
 	def filename(self):