mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 19:42:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix MSYS2 keyring not verifying on path with spaces (#13104)

Browse Source
This commit is contained in:
Daniel 2020-08-25 05:03:24 +01:00 committed by GitHub
parent 99b07566f4
commit 42a90d3c14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/cmake/vcpkg_acquire_msys.cmake
View File

@ -107,7 +107,7 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT)
) )
# install the new keyring # install the new keyring
_execute_process( _execute_process(
COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;pacman-key --verify ${KEYRING_SIG_PATH}" COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;pacman-key --verify \"${KEYRING_SIG_PATH}\""
WORKING_DIRECTORY ${TOOLPATH} WORKING_DIRECTORY ${TOOLPATH}
RESULT_VARIABLE _vam_error_code RESULT_VARIABLE _vam_error_code
) )
@ -115,7 +115,7 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT)
message(FATAL_ERROR "Cannot verify MSYS2 keyring.") message(FATAL_ERROR "Cannot verify MSYS2 keyring.")
endif() endif()
_execute_process( _execute_process(
COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;pacman -U ${KEYRING_PATH} --noconfirm" COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;pacman -U \"${KEYRING_PATH}\" --noconfirm"
WORKING_DIRECTORY ${TOOLPATH} WORKING_DIRECTORY ${TOOLPATH}
) )
# we have to kill all GnuPG daemons otherwise bash would potentially not be # we have to kill all GnuPG daemons otherwise bash would potentially not be