From 1c94e27463862e1e4b208b992a1e45676c8c9625 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Tue, 10 Nov 2015 09:16:48 -1000 Subject: [PATCH] Bugfix:#3167 Nested parameter files under xxxx/yyyy/zzzz/kkkk are considered in the scope of xxxx/yyyy Conflicts: src/lib/ecl --- Tools/px_generate_params.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Tools/px_generate_params.py b/Tools/px_generate_params.py index 5752bac1df4..a78f2641242 100755 --- a/Tools/px_generate_params.py +++ b/Tools/px_generate_params.py @@ -8,6 +8,7 @@ class Scope(object): """ Single parameter group """ + re_deep_lines = re.compile(r'.*\/.*\/') def __init__(self, ): self.scope = set() @@ -27,7 +28,12 @@ class Scope(object): """ if len(self.scope) == 0: return True + # Anything in the form xxxxx/yyyyy/zzzzz.... + # is treated as xxxxx/yyyyy + while (self.re_deep_lines.match(scope)): + scope = os.path.dirname(scope) return scope in self.scope + class CMakeParser(object):