aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Paquier <michael@paquier.xyz>2020-05-06 21:08:38 +0900
committerMichael Paquier <michael@paquier.xyz>2020-05-06 21:08:38 +0900
commite07fdc126ef3c75dedd279f87c3be6e8eed5543d (patch)
tree45d6c3c443d9dd6f649806bbcbdebd4f87c7bdfd
parenta8df87d8638c4ae6e8998fdffe54e02fe71882aa (diff)
downloadpostgresql-e07fdc126ef3c75dedd279f87c3be6e8eed5543d.tar.gz
postgresql-e07fdc126ef3c75dedd279f87c3be6e8eed5543d.zip
Handle spaces for Python install location in MSVC scripts
Attempting to use an installation path of Python that includes spaces caused the MSVC builds to fail. This fixes the issue by using the same quoting method as ad7595b for OpenSSL. Author: Victor Wagner Discussion: https://postgr.es/m/20200430150608.6dc6b8c4@antares.wagner.home Backpatch-through: 9.5
-rw-r--r--src/tools/msvc/Mkvcbuild.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index f1e37145120..f32cee6fb48 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -483,7 +483,7 @@ sub mkvcbuild
my $pythonprog = "import sys;print(sys.prefix);"
. "print(str(sys.version_info[0])+str(sys.version_info[1]))";
my $prefixcmd =
- $solution->{options}->{python} . "\\python -c \"$pythonprog\"";
+ qq("$solution->{options}->{python}\\python" -c "$pythonprog");
my $pyout = `$prefixcmd`;
die "Could not query for python version!\n" if $?;
my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);