Skip to content

bpo-24564: shutil.copystat(): ignore EINVAL on os.setxattr()#13369

Merged
giampaolo merged 5 commits intopython:masterfrom
yingw787:bpo-24564
May 30, 2019
Merged

bpo-24564: shutil.copystat(): ignore EINVAL on os.setxattr()#13369
giampaolo merged 5 commits intopython:masterfrom
yingw787:bpo-24564

Conversation

@yingw787
Copy link
Copy Markdown
Contributor

@yingw787 yingw787 commented May 16, 2019 •
edited
Loading

[First-time contribution]

Carbon copy of PR #8601, except using tuples instead of sets. New pull request needed because original repo fork no longer exists.

This pull request ignores errno.EINVAL (invalid argument) when copying over extended attributes, which may cause copy to fail when copying files from a filesystem that supports extended attributes to filesystem that does not support extended attributes.

This pull request may also address bpo-36850.

CC: @giampaolo @serhiy-storchaka @abadger

https://bugs.python.org/issue24564

@yingw787
BPO-24564 shutil.copystat(): ignore invalid argument error number whe…
6138e35 
…n setting extended attributes using os.setxattr().
@yingw787
Copy link
Copy Markdown
Contributor Author

yingw787 commented May 16, 2019

@abadger I am not sure how to add labels, but I believe #8601 needed a backport to 3.7 and 2.7 as they are currently accepting bugfixes (or maybe just 3.7 if 2.7 bugfix support will be dropped in 2020).

BoboTiG
BoboTiG approved these changes May 18, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@BoboTiG BoboTiG left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @yingw787 for your first contribution :) 🍾
LTGM, even better if you would take into account my remark on the NEWs entry ;)

Misc/NEWS.d/next/Library/2019-05-16-23-40-36.bpo-24564.lIwV_7.rst Outdated
@@ -0,0 +1,3 @@
shutil.copystat(): ignore EINVAL on os.setxattr() which may occur when copying files on NFS filesystems.
Copy link
Copy Markdown
Contributor

@BoboTiG BoboTiG May 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mind adding markup and reword the NEWs entry? I think something like that could be good (think to use blurb to format correctly the lines):

:func:`shutil.copystat` now ignores :const:`errno.EINVAL` on :func:`os.setxattr` which may occur when copying files on filesystems without extended attributes support. Original patch by Giampaolo Rodola, updated by Ying Wang.

Copy link
Copy Markdown
Contributor Author

@yingw787 yingw787 May 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds great, should be pushed 👍

giampaolo
giampaolo requested changes May 28, 2019
View reviewed changes
Lib/shutil.py Outdated
except OSError as e:
if e.errno not in (errno.EPERM, errno.ENOTSUP, errno.ENODATA):
if e.errno not in (errno.EPERM,
errno.ENOTSUP, errno.ENODATA, errno.EINVAL):
Copy link
Copy Markdown
Contributor

@giampaolo giampaolo May 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just a cosmetic/style nitpick - it's better to do this:

                if e.errno not in (errno.EPERM, errno.ENOTSUP, errno.ENODATA,
                                   errno.EINVAL):

Copy link
Copy Markdown
Contributor Author

@yingw787 yingw787 May 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be updated!

@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented May 28, 2019

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@giampaolo giampaolo merged commit a16387a into python:master May 30, 2019
@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented May 30, 2019

Thanks @yingw787 for the PR, and @giampaolo for merging it 🌮🎉.. I'm working now to backport this PR to: 3.7.
🐍🍒⛏🤖

@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented May 30, 2019

Thanks @yingw787 for the PR, and @giampaolo for merging it 🌮🎉.. I'm working now to backport this PR to: 2.7.
🐍🍒⛏🤖

@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented May 30, 2019

GH-13673 is a backport of this pull request to the 3.7 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 30, 2019
@yingw787 @miss-islington
bpo-24564: shutil.copystat(): ignore EINVAL on os.setxattr() (pythonG…
1edb4ec 
…H-13369)

(cherry picked from commit a16387a)

Co-authored-by: Ying Wang <me@yingw787.com>
@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented May 30, 2019

Sorry, @yingw787 and @giampaolo, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker a16387ab2d85f19665920bb6ff91a7e57f59dd2a 2.7

giampaolo pushed a commit that referenced this pull request May 30, 2019
@miss-islington @yingw787 @giampaolo
bpo-24564: shutil.copystat(): ignore EINVAL on os.setxattr() (GH-13369)
f1487b3 
(cherry picked from commit a16387a)

Co-authored-by: Ying Wang <me@yingw787.com>
DinoV pushed a commit to DinoV/cpython that referenced this pull request Jan 14, 2020
@yingw787 @DinoV
bpo-24564: shutil.copystat(): ignore EINVAL on os.setxattr() (pythonG…
a9d733f 
…H-13369)
@chrisburr chrisburr mentioned this pull request Jul 8, 2021
Open
@casparvl casparvl mentioned this pull request Apr 25, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@giampaolo giampaolo giampaolo requested changes

@hynek hynek Awaiting requested review from hynek

@larryhastings larryhastings Awaiting requested review from larryhastings

+1 more reviewer

@BoboTiG BoboTiG BoboTiG approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@giampaolo giampaolo

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@yingw787 @bedevere-bot @miss-islington @giampaolo @BoboTiG @the-knights-who-say-ni