taler-deployment

commit 67bb7caf90f9e089b2f1d504e4872c8abdd5b353
parent a24c23d3bc3c9cdd25fd62a7490e0beaed7dd688
Author: Florian Dold <florian@dold.me>
Date:   Fri,  5 Sep 2025 17:10:12 +0200

packaging-ng: bump, taler-pkg ddeb fixes

Diffstat:
M
packaging/ng/buildconfig/challenger.tag
 | 
2
+-
M
packaging/ng/buildconfig/taler-exchange.tag
 | 
2
+-
M
packaging/ng/buildscripts/generic.sh
 | 
3
+++
M
packaging/ng/taler-pkg
 | 
7
++++---

4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/packaging/ng/buildconfig/challenger.tag b/packaging/ng/buildconfig/challenger.tag
@@ -1 +1 @@
-v1.0.2
+v1.0.3
diff --git a/packaging/ng/buildconfig/taler-exchange.tag b/packaging/ng/buildconfig/taler-exchange.tag
@@ -1 +1 @@
-v1.0.23
+v1.0.24
diff --git a/packaging/ng/buildscripts/generic.sh b/packaging/ng/buildscripts/generic.sh
@@ -70,6 +70,9 @@ dpkg-buildpackage -rfakeroot -b -uc -us
 cp ../*.deb /pkgdir/
 cp ../*.ddeb /pkgdir/ &> /dev/null || true
 
+# We might not have .ddeb files
+shopt -s nullglob
+
 # Save current deb file names for this package.
 truncate -s0 /pkgdir/$PACKAGE.built.current
 for deb in ../*.deb; do
diff --git a/packaging/ng/taler-pkg b/packaging/ng/taler-pkg
@@ -276,11 +276,12 @@ def publish(cfg):
             continue
         with open(f"./packages/{distro}/{component}.built.current") as f:
             current = f.read().split()
+        print("current", current)
         for deb in current:
             if deb.endswith(".deb"):
-                pkg1, ver1, arch1 = deb.removesuffix(".deb").split("_")
+                pkg1, ver1, *rest1 = deb.removesuffix(".deb").split("_")
             elif deb.endswith(".ddeb"):
-                pkg1, ver1, arch1 = deb.removesuffix(".ddeb").split("_")
+                pkg1, ver1, *rest1 = deb.removesuffix(".ddeb").split("_")
             else:
                 raise Error(f"invalid deb filename: {deb}")
             fresh = True
@@ -288,7 +289,7 @@ def publish(cfg):
             # If the server has the same or a later version,
             # the local version isn't fresh.
             for srvdeb in server_debs:
-                pkg2, ver2, arch2 = srvdeb.removesuffix(".deb").split("_")
+                pkg2, ver2, *rest2 = srvdeb.removesuffix(".deb").split("_")
                 if pkg1 != pkg2:
                     continue
                 if Dpkg.compare_versions(ver1, ver2) <= 0: