aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBilly O'Neal <bion@microsoft.com>2020-12-28 19:35:21 -0800
committerGitHub <noreply@github.com>2020-12-28 19:35:21 -0800
commit24290fb0020006e5d1276eb1dcf7498086c7c85e (patch)
tree6583c377f3117ff9641955f4e1a9df6442d7da96
parente2d34085478b0a8d13120287894a52b7e104fd3f (diff)
downloadvcpkg-24290fb0020006e5d1276eb1dcf7498086c7c85e.tar.gz
vcpkg-24290fb0020006e5d1276eb1dcf7498086c7c85e.zip
[vcpkg] Fix pwsh version detection for old versions to download a fresh copy. (#15355)
-rw-r--r--toolsrc/src/vcpkg/tools.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp
index 0b82e7780..54b73c93f 100644
--- a/toolsrc/src/vcpkg/tools.cpp
+++ b/toolsrc/src/vcpkg/tools.cpp
@@ -525,8 +525,8 @@ Mono JIT compiler version 6.8.0.105 (Debian 6.8.0.105+dfsg-2 Wed Feb 26 23:23:50
auto output = std::move(rc.output);
if (!Strings::starts_with(output, "PowerShell "))
{
- Checks::exit_with_message(
- VCPKG_LINE_INFO, "Unexpected format of powershell-core version string: %s", output);
+ return {Strings::concat("Unexpected format of powershell-core version string: ", output),
+ expected_right_tag};
}
output.erase(0, 11);