chown: ignore both pkg/system.EOPNOTSUPP and pkg/system.ErrNotSupportedPlatform #851
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
…edPlatform Where we ignored a pkg/system.ErrNotSupportedPlatform error from pkg/system.Lgetxattr(), also ignore ENOTSUP/EOPNOTSUPP, as we already do elsewhere. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
rhatdan
reviewed
Mar 10, 2021
| @@ -49,7 +50,7 @@ func platformLChown(path string, info os.FileInfo, toHost, toContainer *idtools. | |||
| } | |||
| if uid != int(st.Uid) || gid != int(st.Gid) { | |||
| cap, err := system.Lgetxattr(path, "security.capability") | |||
| if err != nil && err != system.ErrNotSupportedPlatform { | |||
| if err != nil && !errors.Is(err, system.EOPNOTSUPP) && err != system.ErrNotSupportedPlatform { | |||
rhatdan
approved these changes
Mar 10, 2021
|
LGTM, thanks @nalind |
|
@nalind, silly question from someone who is new to container-related development: how does this change make its way back to podman to fix #9687? The reason I ask is that the podman repository contains a copy of containers/storage. Does the podman build process pull this code from here, or does it use its local copy? Why is there a copy in the podman repository? Thank you for the quick work, by the way! |
|
@flyn-org We will cut a release of containers/storage and then in podman we will vendor in (Copy/Update) its code with the newly released code. |
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.
Where we ignored a pkg/system.ErrNotSupportedPlatform error from pkg/system.Lgetxattr(), also ignore ENOTSUP/EOPNOTSUPP, as we already do elsewhere. Should fix containers/podman#9687.