Fix using the legacy GraalVM layout

msimacek · msimacek · commit ee186b0ca47b · 2024-07-30T16:38:07.000+02:00
diff --git a/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java b/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java
@@ -943,6 +943,11 @@ private void findAndApplyVenvCfg(Builder contextBuilder, String executable) {
                         }
                         if (Files.exists(baseExecutable)) {
                             contextBuilder.option("python.BaseExecutable", baseExecutable.toString());
+                            /*
+                             * This is needed to support the legacy GraalVM layout where the
+                             * executable is a symlink into the 'languages' directory.
+                             */
+                            contextBuilder.option("python.PythonHome", baseExecutable.getParent().getParent().toString());
                         }
                     } catch (NullPointerException | InvalidPathException ex) {
                         // NullPointerException covers the possible null result of getParent()

Original file line number	Diff line number	Diff line change
`@@ -943,6 +943,11 @@ private void findAndApplyVenvCfg(Builder contextBuilder, String executable) {`
`943`	`943`	`}`
`944`	`944`	`if (Files.exists(baseExecutable)) {`
`945`	`945`	`contextBuilder.option("python.BaseExecutable", baseExecutable.toString());`
	`946`	`+ /*`
	`947`	`+ * This is needed to support the legacy GraalVM layout where the`
	`948`	`+ * executable is a symlink into the 'languages' directory.`
	`949`	`+ */`
	`950`	`+ contextBuilder.option("python.PythonHome", baseExecutable.getParent().getParent().toString());`
`946`	`951`	`}`
`947`	`952`	`} catch (NullPointerException \| InvalidPathException ex) {`
`948`	`953`	`// NullPointerException covers the possible null result of getParent()`