]> git.ipfire.org Git - pbs.git/commitdiff
packages: Generate a better download URL
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 28 Jun 2022 10:44:27 +0000 (10:44 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 28 Jun 2022 10:44:27 +0000 (10:44 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/buildservice/packages.py

index 3e9b7fb9bfb5146ad99a8bd3b210d46d65615922..38c3139048ae49b668ac96f95d551cf8b937e55e 100644 (file)
@@ -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):