Merge pull request #622 from linsword13/fix-anti-match

Fix anti-match
GoogleCloudPlatform · Aug 23, 2024 · 4195c08 · 4195c08
2 parents 4f2d350 + 37171f9
commit 4195c08
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/lib/ramble/ramble/application.py b/lib/ramble/ramble/application.py
@@ -1941,12 +1941,23 @@ def _analysis_dicts(self, criteria_list):
         for success_scope, success_list in success_lists:
             for criteria, conf in success_list.items():
                 if conf["mode"] == "string":
+                    match = (
+                        self.expander.expand_var(conf["match"])
+                        if conf["match"] is not None
+                        else None
+                    )
+                    anti_match = (
+                        self.expander.expand_var(conf["anti_match"])
+                        if conf["anti_match"] is not None
+                        else None
+                    )
                     criteria_list.add_criteria(
                         success_scope,
                         criteria,
-                        conf["mode"],
-                        re.compile(self.expander.expand_var(conf["match"])),
-                        conf["file"],
+                        mode=conf["mode"],
+                        match=match,
+                        file=conf["file"],
+                        anti_match=anti_match,
                     )
                 elif conf["mode"] == "fom_comparison":
                     criteria_list.add_criteria(