Skip to content

Commit

Permalink
fixes #309. Fixes #310
Browse files Browse the repository at this point in the history
  • Loading branch information
o-smirnov committed Jun 9, 2024
1 parent 9448658 commit 9c5ed08
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion stimela/kitchen/recipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ def do_assign(assignments):
Substitution errors are ignored at this stage, a final round of re-evaluation with ignore=False is done at the end.
"""
# flatten assignments
flattened = flatten_dict(assignments)
flattened = assignments # flatten_dict(assignments)
# drop entries protected from assignment
flattened = {name: value for name, value in flattened.items() if name not in self._protected_from_assign}
# merge into recipe namespace
Expand Down
2 changes: 2 additions & 0 deletions stimela/kitchen/step.py
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,8 @@ def run(self, backend: Optional[Dict] = None, subst: Optional[Dict[str, Any]] =
skip = self._skip
if self._skip is None and subst is not None:
skip = evaluate_and_substitute_object(self.skip, subst, location=[self.fqname, "skip"])
if skip is UNSET: # skip: =IFSET(recipe.foo) will return UNSET
skip = False
self.log.debug(f"dynamic skip attribute evaluation returns {skip}")
# formulas with unset variables return UNSET instance
if isinstance(skip, UNSET):
Expand Down

0 comments on commit 9c5ed08

Please sign in to comment.