From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 29 Nov 2024 13:53:51 +0000 (+0100)
Subject: generate-repo-files: pick up git versions from output too
X-Git-Tag: rec-5.2.0-rc1~24^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F14904%2Fhead;p=thirdparty%2Fpdns.git

generate-repo-files: pick up git versions from output too
---

diff --git a/build-scripts/docker/repo-test/generate-repo-files.py b/build-scripts/docker/repo-test/generate-repo-files.py
index 63af7fbd5f..026a831e9d 100755
--- a/build-scripts/docker/repo-test/generate-repo-files.py
+++ b/build-scripts/docker/repo-test/generate-repo-files.py
@@ -207,7 +207,7 @@ def run (tag, arch='x86_64'):
                              tag],
                             stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     version = re.search(r'(PowerDNS Authoritative Server|PowerDNS Recursor|' +
-                        r'dnsdist) (\d+\.\d+\.\d+(-\w+)?)',
+                        r'dnsdist) (\d+\.\d+\.\d+(-\w+)?[^ ]*)',
                         cp.stdout.decode())
     if g_verbose:
         print(cp.stdout.decode())