[6] Merge remote-tracking branch 'ymendel/ym/conditional-on-default' into nightly

9 months ago · b5e44976bd
parent f6067e946f 33be6976e1
commit b5e44976bd
1 changed files with 3 additions and 2 deletions
--- a/modules/meta.py
+++ b/modules/meta.py
@ -399,8 +399,9 @@ class DataFile:
                                        error_text = "- exists"
                                    con_var_value = var_key[:-7]
                                elif var_key.endswith(".not"):
-                                    if var_key[:-4] in variables:
-                                        con_var_value = variables[var_key[:-4]]
+                                    var_name = var_key[:-4]
+                                    if var_name in variables or var_name in default:
+                                        con_var_value = variables[var_name] if var_name in variables else default[var_name]
                                        if isinstance(var_value, list):
                                            if con_var_value in var_value:
                                                error_text = f'in {var_value}'