taler-deployment

commit 98a6dfbd858d4f51d151d08661c06aaa7658e90a
parent ac6fa13605f68a3e7c24ba723b4e9c77285f028a
Author: Florian Dold <florian@dold.me>
Date:   Sun, 16 Nov 2025 14:24:00 +0100

better ddeb support

Diffstat:
M
packaging/ng/taler-pkg
 | 
16
++++++++--------

1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/packaging/ng/taler-pkg b/packaging/ng/taler-pkg
@@ -218,7 +218,7 @@ def show_order(cfg):
 def show_published(cfg):
     distro = cfg.distro
     vendor, codename = distro.split("-", 1)
-    listfmt = "${package}_${version}_${architecture}.deb\n"
+    listfmt = "${package}_${version}_${architecture}.${$type}\n"
     subprocess.run(
         [
             "ssh",
@@ -233,7 +233,7 @@ def promote(cfg):
     dry = cfg.dry
     distro = cfg.distro
     vendor, codename = distro.split("-", 1)
-    listfmt = "${package}_${version}_${architecture}.deb\n"
+    listfmt = "${package}_${version}_${architecture}.${$type}\n"
     if dry:
         subprocess.run(
             [
@@ -275,7 +275,7 @@ def publish(cfg):
     vendor, codename = distro.split("-", 1)
     # List of .deb and .ddeb files.
     debs = []
-    listfmt = "${package}_${version}_${architecture}.deb\n"
+    listfmt = "${package}_${version}_${architecture}.${$type}\n"
     server_debs_str = subprocess.check_output(
         [
             "ssh",
@@ -345,16 +345,16 @@ def publish(cfg):
         )
         if ret.returncode != 0:
             # Usually not critical if it fails.
-            print(
-                "Including debs failed. This can happen when including packages that have been included previously"
-            )
-        # almost the same, but with ddebs
+        # Almost the same, but with ddebs.
+        # We explicitly need to tell reprepro
+        # to ignore the extension, because it does not
+        # deal well with ddebs out of the box.
         ret = subprocess.run(
             [
                 "ssh",
                 "-t",
                 f"taler-packaging@{host}",
-                f"reprepro -b /home/taler-packaging/www/apt/{vendor}/ includedeb {codename}-testing ~/{vendor}-{codename}/*.ddeb",
+                f"reprepro --ignore=extension -b /home/taler-packaging/www/apt/{vendor}/ includedeb {codename}-testing ~/{vendor}-{codename}/*.ddeb",
             ],
         )
         if ret.returncode != 0: