From dc58f56998f486db3a002c7c08aecc6678c0c1fe Mon Sep 17 00:00:00 2001 From: Josef Eisl Date: Sat, 10 Feb 2024 07:25:07 +0100 Subject: [PATCH 1/2] fix mergetool_suite_import --- src/mx/_impl/mergetool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mx/_impl/mergetool.py b/src/mx/_impl/mergetool.py index 33469dd9..7d3a244f 100644 --- a/src/mx/_impl/mergetool.py +++ b/src/mx/_impl/mergetool.py @@ -115,7 +115,7 @@ def read_suite_imports(filename): exec(local_fp.read(), my_globals, my_locals) # pylint: disable=exec-used except Exception as ex: # pylint: disable=broad-except _fallback(f"Cannot load suite file {filename}: {ex}") - return locals.get("suite", {}).get("imports", {}).get("suites") + return my_locals.get("suite", {}).get("imports", {}).get("suites") def to_import_dict(suite_imports): return {s["name"]: s["version"] for s in suite_imports if "version" in s} From d1a1e46a336a4fc27500d64c0ecf5e1cf53ec886 Mon Sep 17 00:00:00 2001 From: Josef Eisl Date: Sat, 10 Feb 2024 07:47:48 +0100 Subject: [PATCH 2/2] Bump version --- src/mx/_impl/mx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mx/_impl/mx.py b/src/mx/_impl/mx.py index 6677f6eb..052a36cf 100755 --- a/src/mx/_impl/mx.py +++ b/src/mx/_impl/mx.py @@ -19245,7 +19245,7 @@ def alarm_handler(signum, frame): abort(1, killsig=signal.SIGINT) # The version must be updated for every PR (checked in CI) and the comment should reflect the PR's issue -version = VersionSpec("7.9.1") # GR-51960: make fetch-jdk work on Windows +version = VersionSpec("7.9.2") # fix mx mergetool-suite-import _mx_start_datetime = datetime.utcnow()