Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[vcpkg] fail archived port install when decompression fails #7086

Merged
merged 2 commits into from
Jun 30, 2019
Merged

[vcpkg] fail archived port install when decompression fails #7086

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82566e9
[vcpkg] fail port install when decompression fails
Rastaban Jun 28, 2019
9b2ce4e
[vcpkg] clang-format
ras0219-msft Jun 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions toolsrc/src/vcpkg/build.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ namespace vcpkg::Build
return nullopt;
}

static void decompress_archive(const VcpkgPaths& paths, const PackageSpec& spec, const fs::path& archive_path)
static int decompress_archive(const VcpkgPaths& paths, const PackageSpec& spec, const fs::path& archive_path)
{
auto& fs = paths.get_filesystem();

Expand All @@ -601,12 +601,13 @@ namespace vcpkg::Build
#if defined(_WIN32)
auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP);

System::cmd_execute_clean(Strings::format(
int result = System::cmd_execute_clean(Strings::format(
R"("%s" x "%s" -o"%s" -y >nul)", seven_zip_exe.u8string(), archive_path.u8string(), pkg_path.u8string()));
#else
System::cmd_execute_clean(
int result = System::cmd_execute_clean(
Strings::format(R"(unzip -qq "%s" "-d%s")", archive_path.u8string(), pkg_path.u8string()));
#endif
return result;
}

// Compress the source directory into the destination file.
Expand Down Expand Up @@ -692,11 +693,16 @@ namespace vcpkg::Build
{
System::print2("Using cached binary package: ", archive_path.u8string(), "\n");

decompress_archive(paths, spec, archive_path);
auto archive_result = decompress_archive(paths, spec, archive_path);

if (archive_result != 0)
{
System::print2("Failed to decompress archive package\n");
return BuildResult::BUILD_FAILED;
}

auto maybe_bcf = Paragraphs::try_load_cached_package(paths, spec);
std::unique_ptr<BinaryControlFile> bcf =
std::make_unique<BinaryControlFile>(std::move(maybe_bcf).value_or_exit(VCPKG_LINE_INFO));
auto bcf = std::make_unique<BinaryControlFile>(std::move(maybe_bcf).value_or_exit(VCPKG_LINE_INFO));
return {BuildResult::SUCCEEDED, std::move(bcf)};
}

Expand Down