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

pull/1973/head
meisnate12 8 months ago
commit b5e44976bd

@ -399,8 +399,9 @@ class DataFile:
error_text = "- exists" error_text = "- exists"
con_var_value = var_key[:-7] con_var_value = var_key[:-7]
elif var_key.endswith(".not"): elif var_key.endswith(".not"):
if var_key[:-4] in variables: var_name = var_key[:-4]
con_var_value = variables[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 isinstance(var_value, list):
if con_var_value in var_value: if con_var_value in var_value:
error_text = f'in {var_value}' error_text = f'in {var_value}'

Loading…
Cancel
Save