]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
generate-repo-files: pick up git versions from output too 14904/head
authorPeter van Dijk <peter.van.dijk@powerdns.com>
Fri, 29 Nov 2024 13:53:51 +0000 (14:53 +0100)
committerPeter van Dijk <peter.van.dijk@powerdns.com>
Fri, 29 Nov 2024 13:53:51 +0000 (14:53 +0100)
build-scripts/docker/repo-test/generate-repo-files.py

index 63af7fbd5f822d906cb8b8c9b95cd12763a3cf05..026a831e9da82279dceca530fc3b3deb0b1c965a 100755 (executable)
@@ -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())