From: Andrei Pavel <andrei@isc.org>
Date: Thu, 21 Mar 2024 14:35:38 +0000 (+0200)
Subject: [#3267] fix find header script not finding files
X-Git-Tag: Kea-2.5.7~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c5a46e49d22bc8b397254e680fb70d14bdd00c6;p=thirdparty%2Fkea.git

[#3267] fix find header script not finding files

Script did not find files that are on the same line as the _HEADERS
variable.
---

diff --git a/tools/find-uninstalled-headers.py b/tools/find-uninstalled-headers.py
index 5963af6e57..2b934b59fc 100755
--- a/tools/find-uninstalled-headers.py
+++ b/tools/find-uninstalled-headers.py
@@ -32,12 +32,12 @@ def main():
 
                 header = None
 
+                backslash_matches = backslash_pattern.search(line)
                 headers_matches = headers_pattern.search(line)
                 if headers_matches is None:
                     if not in_headers_block:
                         continue
 
-                    backslash_matches = backslash_pattern.search(line)
                     if backslash_matches is None:
                         header = line
                         in_headers_block = False
@@ -45,8 +45,9 @@ def main():
                         header = backslash_matches.group(1)
                 else:
                     in_headers_block = True
-                    if '\\' in headers_matches.group(2) and len(headers_matches.group(1)) != 0:
-                        header = headers_matches.group(1)
+                    candidate = headers_matches.group(1)
+                    if backslash_matches is None and len(candidate):
+                        header = candidate
 
                 if header is not None:
                     relative_path = makefile_am.parent / header.strip()