This commit is contained in:
@@ -27,6 +27,7 @@ class PresetEntryDetector(EntryDetector):
|
||||
return ENTRY_SKIP
|
||||
tasks = []
|
||||
global_variables = {f"env_{k.lower()}": v for k, v in environ.items()}
|
||||
entry_variables = {}
|
||||
presets = sorted(
|
||||
preset.presets.items(), key=lambda item: item[1].priority, reverse=True
|
||||
)
|
||||
@@ -39,6 +40,7 @@ class PresetEntryDetector(EntryDetector):
|
||||
if tag == "*":
|
||||
template.update_variables(preset.variables, global_variables)
|
||||
template.update_variables(preset.variables, preset_variables)
|
||||
entry_variables.update(preset_variables)
|
||||
if preset.conditions and not template.check_conditions(
|
||||
preset.conditions, preset_variables
|
||||
):
|
||||
@@ -73,5 +75,5 @@ class PresetEntryDetector(EntryDetector):
|
||||
tasks.append(task)
|
||||
if tasks:
|
||||
tasks = sorted(tasks, key=operator.attrgetter("priority"), reverse=True)
|
||||
return Entry(tasks, basepath, rootpath)
|
||||
return Entry(tasks, entry_variables, basepath, rootpath)
|
||||
return ENTRY_NONE
|
||||
|
||||
Reference in New Issue
Block a user