postgres.git / summary / log / commit / refs

commit    984aca448d5dba0f1be162ce41aa23becf5e931a
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Wed May 06 12:08:26 2020 +0000
First released in: 13.0, 9.5.22, 9.6.18, 10.13, 11.8, 12.3

    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


 src/tools/msvc/Mkvcbuild.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index a083ac77f6e..e08ea61cfb5 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -487,7 +487,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);


[parent: a2098b60216c]