Pkg installation fix #2990
Merged
Pkg installation fix #2990
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
|
@RipleyTom, thanks for your PR! By analyzing the history of the files in this pull request, we identified @Nekotekina to be a potential reviewer. |
Nekotekina
reviewed
Jul 12, 2017
rpcs3/Crypto/unpkg.cpp
Outdated
| @@ -228,45 +228,51 @@ bool pkg_install(const fs::file& pkg_f, const std::string& dir, atomic_t<double> | |||
|
|
|||
| const bool did_overwrite = fs::is_file(path); | |||
|
|
|||
| if (fs::file out{ path, fs::rewrite }) | |||
| if (did_overwrite && entry.type&PKG_FILE_ENTRY_OVERWRITE) | |||
There was a problem hiding this comment.
Wrong condition. Also redo without moving the other code.
Nekotekina
reviewed
Jul 12, 2017
rpcs3/Crypto/unpkg.cpp
Outdated
| @@ -228,6 +228,12 @@ bool pkg_install(const fs::file& pkg_f, const std::string& dir, atomic_t<double> | |||
|
|
|||
| const bool did_overwrite = fs::is_file(path); | |||
|
|
|||
| if (did_overwrite && (entry.type&PKG_FILE_ENTRY_OVERWRITE == 0)) | |||
There was a problem hiding this comment.
must be (entry.type & PKG_FILE_ENTRY_OVERWRITE) == 0
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.
Fixes pkg overwriting files without the PKG_FILE_ENTRY_OVERWRITE flag