[taler-deployment] branch master updated: packaging: bump versions

[Admin]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository taler-deployment.

The following commit(s) were added to refs/heads/master by this push:
     new 3bc7c75  packaging: bump versions
3bc7c75 is described below

commit 3bc7c75dfa70483f19c987de8c217d0497d9d524
Author: Florian Dold <florian@dold.me>
AuthorDate: Thu Jun 12 23:51:29 2025 +0200

    packaging: bump versions
---
 packaging/ng/buildconfig/taler-exchange.tag |  2 +-
 packaging/ng/taler-pkg                      | 33 +++++++++++++------------
 packaging/ng/util/__init__.py               | 38 +++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/packaging/ng/buildconfig/taler-exchange.tag 
b/packaging/ng/buildconfig/taler-exchange.tag
index 14b34a4..e04e39c 100644
--- a/packaging/ng/buildconfig/taler-exchange.tag
+++ b/packaging/ng/buildconfig/taler-exchange.tag
@@ -1 +1 @@
-v1.0.8
+v1.0.9
diff --git a/packaging/ng/taler-pkg b/packaging/ng/taler-pkg
index ca09b87..77622e0 100755
--- a/packaging/ng/taler-pkg
+++ b/packaging/ng/taler-pkg
@@ -244,22 +244,25 @@ def publish(cfg):
                 print("package", deb, "not fresh, server has", server_deb)
     if len(debs) == 0:
         print("nothing to upload")
-        return
-    print("uploading debs", debs)
-    if cfg.dry:
-        return
-    debs = [Path(f"./packages/{distro}/") / x for x in debs]
-    subprocess.run(
-        ["ssh", f"taler-packaging@{host}", f"rm -f 
'/home/taler-packaging/{distro}/'*.deb"], check=True
-    )
-    subprocess.run(
-        ["scp", "--", *debs, f"taler-packaging@{host}:{distro}/"], check=True
-    )
-    subprocess.run(
-        ["ssh", f"taler-packaging@{host}", f"./include-{distro}.sh"], 
check=True
-    )
+    else:
+        print("uploading debs", debs)
+        if cfg.dry:
+            return
+        debs = [Path(f"./packages/{distro}/") / x for x in debs]
+        subprocess.run(
+            ["ssh", f"taler-packaging@{host}", f"rm -f 
'/home/taler-packaging/{distro}/'*.deb"], check=True
+        )
+        subprocess.run(
+            ["scp", "--", *debs, f"taler-packaging@{host}:{distro}/"], 
check=True
+        )
+        subprocess.run(
+            ["ssh", "-t", f"taler-packaging@{host}", 
f"./include-{distro}.sh"], check=True
+        )
+    # Always export!
+    # Reprepro is weird, listed packages might actually not show
+    # up in the index yet.
     subprocess.run(
-        ["ssh", f"taler-packaging@{host}", f"./export-{distro}.sh"], check=True
+        ["ssh", "-t", f"taler-packaging@{host}", f"./export-{distro}.sh"], 
check=True
     )
 
 
diff --git a/packaging/ng/util/__init__.py b/packaging/ng/util/__init__.py
index b2ae2d6..3855a25 100644
--- a/packaging/ng/util/__init__.py
+++ b/packaging/ng/util/__init__.py
@@ -153,6 +153,44 @@ class Dpkg:
         upstream_rev, debian_rev = Dpkg.get_upstream(full_ver)
         return epoch, upstream_rev, debian_rev
 
+    @staticmethod
+    def compare_revision_strings(rev1, rev2):
+        """Compare two debian revision strings as described at
+        
https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Version
+        """
+        if rev1 == rev2:
+            return 0
+        # listify pads results so that we will always be comparing ints to ints
+        # and strings to strings (at least until we fall off the end of a list)
+        list1 = Dpkg.listify(rev1)
+        list2 = Dpkg.listify(rev2)
+        if list1 == list2:
+            return 0
+        try:
+            for i, item in enumerate(list1):
+                # just in case
+                if not isinstance(item, list2[i].__class__):
+                    raise DpkgVersionError(
+                        'Cannot compare %s to %s, something has gone horribly '
+                        'awry.' % (item, list2[i]))
+                # if the items are equal, next
+                if item == list2[i]:
+                    continue
+                # numeric comparison
+                if isinstance(item, int):
+                    if item > list2[i]:
+                        return 1
+                    if item < list2[i]:
+                        return -1
+                else:
+                    # string comparison
+                    return Dpkg.dstringcmp(item, list2[i])
+        except IndexError:
+            # rev1 is longer than rev2 but otherwise equal, hence greater
+            return 1
+        # rev1 is shorter than rev2 but otherwise equal, hence lesser
+        return -1
+
     @staticmethod
     def compare_versions(ver1, ver2):
         """Function to compare two Debian package version strings,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.