[GR-50341] Fix mx mergetool-suite-import

PullRequest: mx/1747
graalvm · Feb 10, 2024 · b1295de · b1295de
2 parents 2fe0e3c + d1a1e46
commit b1295de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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}

diff --git 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()