aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-10-02 16:00:45 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-10-02 16:00:45 -0700
commit4c4e6c7c7af52732de07ca247cf62e2a3c5d2f25 (patch)
treee81089415d1a7d186f732cd489d64dc462a6d45e
parent1130cc378442abd033bb99fa6dede812a5dc2825 (diff)
downloadvcpkg-4c4e6c7c7af52732de07ca247cf62e2a3c5d2f25.tar.gz
vcpkg-4c4e6c7c7af52732de07ca247cf62e2a3c5d2f25.zip
Extract local variable
-rw-r--r--toolsrc/src/VcpkgPaths.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/toolsrc/src/VcpkgPaths.cpp b/toolsrc/src/VcpkgPaths.cpp
index f227f9114..d491cb7fb 100644
--- a/toolsrc/src/VcpkgPaths.cpp
+++ b/toolsrc/src/VcpkgPaths.cpp
@@ -67,11 +67,12 @@ namespace vcpkg
const fs::path& expected_downloaded_path,
const std::array<int, 3>& version)
{
+ const std::string tool_name_utf8 = Strings::to_utf8(tool_name);
const std::string version_as_string = Strings::format("%d.%d.%d", version[0], version[1], version[2]);
System::println("A suitable version of %s was not found (required v%s). Downloading portable %s v%s...",
- Strings::to_utf8(tool_name),
+ tool_name_utf8,
version_as_string,
- Strings::to_utf8(tool_name),
+ tool_name_utf8,
version_as_string);
const fs::path script = scripts_folder / "fetchDependency.ps1";
const auto install_cmd =
@@ -82,7 +83,7 @@ namespace vcpkg
System::println(System::Color::error,
"Launching powershell failed or was denied when trying to fetch %s version %s.\n"
"(No sufficient installed version was found)",
- Strings::to_utf8(tool_name),
+ tool_name_utf8,
version_as_string);
{
auto locked_metrics = Metrics::g_metrics.lock();