Fix Windows regression introduced by PR #1161 #1169
Merged
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
Before 52108b7 this code used unshare.IsRootless() which on Windows always returns false (the behavior we want). After 52108b7, a condition was unintentionally inverted, allowing Windows to function. Commit f8f2c4f fixed the inversion, but unintentionally excluded Windows since it used == 0 instead of <= 0 (Windows returns -1) Move the logic behind a function with a comment since the Windows path is a bit exotic. In the future, the Windows path should likely be refactored to be more intuitive; however, this will get things working for now. Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: giuseppe, n1hility The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/lgtm I will have to cut another release once this merges. |
|
/hold cancel |
flouthoc
reviewed
Sep 30, 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.
Before 52108b7 this code used unshare.IsRootless() which on Windows always returns false (the behavior we want).
After 52108b7, a condition was unintentionally inverted, allowing Windows to function.
Commit f8f2c4f fixed the inversion, but unintentionally excluded Windows since it used == 0 instead of <= 0 (Windows returns -1)
Move the logic behind a function with a comment since the Windows path is a bit exotic.
In the future, the Windows path should likely be refactored to be more intuitive; however, this will get things working for now.