diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-10 17:03:47 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-10 17:04:29 -0800 |
| commit | ea52c29e9af701c4a2e070f836bb1ffb7e092760 (patch) | |
| tree | b37d27fbffdcfa78646c1c07c7b70486428b9cd3 | |
| parent | c59ac4e344fb96b0ab09189345519d7cf237577c (diff) | |
| download | vcpkg-ea52c29e9af701c4a2e070f836bb1ffb7e092760.tar.gz vcpkg-ea52c29e9af701c4a2e070f836bb1ffb7e092760.zip | |
Use System::cmd_execute_clean() for `build`, `create`, `portsdiff`
| -rw-r--r-- | toolsrc/src/commands_build.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_create.cpp | 6 | ||||
| -rw-r--r-- | toolsrc/src/commands_portsdiff.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp index f2dabe25e..a47083cbd 100644 --- a/toolsrc/src/commands_build.cpp +++ b/toolsrc/src/commands_build.cpp @@ -60,7 +60,7 @@ namespace vcpkg::Commands::Build const ElapsedTime timer = ElapsedTime::createStarted(); - int return_code = System::cmd_execute(command); + int return_code = System::cmd_execute_clean(command); auto buildtimeus = timer.microseconds(); TrackMetric("buildtimeus-" + spec.toString(), buildtimeus); diff --git a/toolsrc/src/commands_create.cpp b/toolsrc/src/commands_create.cpp index fc795c621..b74693ed5 100644 --- a/toolsrc/src/commands_create.cpp +++ b/toolsrc/src/commands_create.cpp @@ -30,12 +30,12 @@ namespace vcpkg::Commands::Create { const std::string& zip_file_name = args.command_arguments.at(2); Checks::check_exit(!Files::has_invalid_chars_for_filesystem(zip_file_name), - R"(Filename cannot contain invalid chars %s, but was %s)", - Files::FILESYSTEM_INVALID_CHARACTERS, zip_file_name); + R"(Filename cannot contain invalid chars %s, but was %s)", + Files::FILESYSTEM_INVALID_CHARACTERS, zip_file_name); cmake_args.push_back({ L"FILENAME", zip_file_name }); } const std::wstring cmd_launch_cmake = make_cmake_cmd(cmake_exe, paths.ports_cmake, cmake_args); - exit(System::cmd_execute(cmd_launch_cmake)); + exit(System::cmd_execute_clean(cmd_launch_cmake)); } } diff --git a/toolsrc/src/commands_portsdiff.cpp b/toolsrc/src/commands_portsdiff.cpp index 065a35345..4d5a589f6 100644 --- a/toolsrc/src/commands_portsdiff.cpp +++ b/toolsrc/src/commands_portsdiff.cpp @@ -46,7 +46,7 @@ namespace vcpkg::Commands::PortsDiff checkout_this_dir, L".vcpkg-root", git_exe.native()); - System::cmd_execute(cmd); + System::cmd_execute_clean(cmd); const std::vector<SourceParagraph> source_paragraphs = Paragraphs::load_all_ports(temp_checkout_path / ports_dir_name_as_string); const std::map<std::string, std::string> names_and_versions = Paragraphs::extract_port_names_and_versions(source_paragraphs); fs::remove_all(temp_checkout_path); |
