bpo-37649: Fix exec_prefix check (GH-14897)

miss-islington · orivej · web-flow · commit 328cfde754c6 · 2019-09-09T11:12:00.000-07:00
(cherry picked from commit 09090d0) Co-authored-by: Orivej Desh <orivej@gmx.fr>
diff --git a/Modules/getpath.c b/Modules/getpath.c
@@ -909,7 +909,7 @@ calculate_init(PyCalculatePath *calculate,
         return DECODE_LOCALE_ERR("PREFIX define", len);
     }
     calculate->exec_prefix = Py_DecodeLocale(EXEC_PREFIX, &len);
-    if (!calculate->prefix) {
+    if (!calculate->exec_prefix) {
         return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);
     }
     calculate->lib_python = Py_DecodeLocale("lib/python" VERSION, &len);

Original file line number	Diff line number	Diff line change
`@@ -909,7 +909,7 @@ calculate_init(PyCalculatePath *calculate,`
`909`	`909`	`return DECODE_LOCALE_ERR("PREFIX define", len);`
`910`	`910`	`}`
`911`	`911`	`calculate->exec_prefix = Py_DecodeLocale(EXEC_PREFIX, &len);`
`912`		`- if (!calculate->prefix) {`
	`912`	`+ if (!calculate->exec_prefix) {`
`913`	`913`	`return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);`
`914`	`914`	`}`
`915`	`915`	`calculate->lib_python = Py_DecodeLocale("lib/python" VERSION, &len);`