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

miss-islington · orivej · web-flow · commit e83296314583 · 2019-09-09T10:59:18.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
@@ -1142,7 +1142,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
`@@ -1142,7 +1142,7 @@ calculate_init(PyCalculatePath *calculate,`
`1142`	`1142`	`return DECODE_LOCALE_ERR("PREFIX define", len);`
`1143`	`1143`	`}`
`1144`	`1144`	`calculate->exec_prefix = Py_DecodeLocale(EXEC_PREFIX, &len);`
`1145`		`- if (!calculate->prefix) {`
	`1145`	`+ if (!calculate->exec_prefix) {`
`1146`	`1146`	`return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);`
`1147`	`1147`	`}`
`1148`	`1148`	`calculate->lib_python = Py_DecodeLocale("lib/python" VERSION, &len);`