Use System32\tar.exe if present instead of 7zip for zip archives. #406
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is a more targeted hotfix version of microsoft#404 as there are outstanding code review discussions there. (I do still intend to apply the changes therein but don't want code reviewers to feel like they can't say anything because it's resolving a high priority issue)
|
This PR + #405 + #407. Should solve all msiexec issues and completely move from 7z to tar.
|
strega-nil
approved these changes
Mar 3, 2022
src/vcpkg/base/system.cpp
Outdated
|
|
||
| const ExpectedS<Path>& get_system32() noexcept | ||
| { | ||
| static const ExpectedS<Path> s_system32 = get_system_root().map([](const Path& p) { return p / "system32"; }); |
There was a problem hiding this comment.
Suggested change
| static const ExpectedS<Path> s_system32 = get_system_root().map([](const Path& p) { return p / "system32"; }); | |
| static const ExpectedS<Path> s_system32 = get_system_root().map([](const Path& p) { return p / "System32"; }); |
I'd prefer it to use the canonical casing (even if it doesn't really matter)
include/vcpkg/tools.h
Outdated
| struct ToolCache | ||
| { | ||
| virtual ~ToolCache() { } | ||
| virtual ~ToolCache(); |
There was a problem hiding this comment.
Suggested change
| virtual ~ToolCache(); | |
| virtual ~ToolCache() = default; |
no reason to put this in the C++ file I think
| const auto code = | ||
| cmd_execute(Command{cmake_tool}.string_arg("-E").string_arg("tar").string_arg("xzf").path_arg(archive), | ||
| WorkingDirectory{to_path}); | ||
| Checks::check_exit(VCPKG_LINE_INFO, code == 0, "tar failed while extracting %s", archive); |
There was a problem hiding this comment.
Should this use localized message?
There was a problem hiding this comment.
I made everything localized in the other PR but this PR is intentionally the minimal change.
ras0219-msft
approved these changes
Mar 3, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a more targeted hotfix version of #404 as there are outstanding code review discussions there. (I do still intend to apply the changes therein but don't want code reviewers to feel like they can't say anything because it's resolving a high priority issue)