Skip to content

Commit 347bace

Browse files
committed
Fix version meta update
1 parent 84c6140 commit 347bace

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

automation/script/module.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,10 @@ def _run(self, i):
732732
variation_tags_string = r['variation_tags_string']
733733
explicit_variation_tags = r['explicit_variation_tags']
734734

735-
r = self._update_state_from_version(meta, i)
735+
r = self._update_state_from_version(meta, run_state, i)
736+
if r['return'] > 0:
737+
return r
738+
736739
version = r['version']
737740
version_min = r['version_min']
738741
version_max = r['version_max']
@@ -1906,7 +1909,7 @@ def _run(self, i):
19061909
return rr
19071910

19081911
##########################################################################
1909-
def _update_state_from_version(self, meta, i):
1912+
def _update_state_from_version(self, meta, run_state, i):
19101913

19111914
# USE CASE:
19121915
# HERE we may have versions in script input and env['MLC_VERSION_*']
@@ -1981,21 +1984,20 @@ def _update_state_from_version(self, meta, i):
19811984
versions_meta = versions[version]
19821985
r = self.update_state_from_meta(
19831986
versions_meta,
1984-
self.run_state,
1987+
run_state,
19851988
i)
19861989
if r['return'] > 0:
19871990
return r
1988-
19891991
adr = get_adr(versions_meta)
19901992
if adr:
19911993
self._merge_dicts_with_tags(self.add_deps_recursive, adr)
19921994
# Processing them again using updated deps for
19931995
# add_deps_recursive
19941996
r = update_adr_from_meta(
1995-
self.run_state['deps'],
1996-
self.run_state['post_deps'],
1997-
self.run_state['prehook_deps'],
1998-
self.run_state['posthook_deps'],
1997+
run_state['deps'],
1998+
run_state['post_deps'],
1999+
run_state['prehook_deps'],
2000+
run_state['posthook_deps'],
19992001
self.add_deps_recursive,
20002002
env)
20012003

0 commit comments

Comments
 (0)