summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <me@yingw787.com>2019-05-30 03:25:31 (GMT)
committerGiampaolo Rodola <g.rodola@gmail.com>2019-05-30 03:25:31 (GMT)
commita16387ab2d85f19665920bb6ff91a7e57f59dd2a (patch)
tree9fad8608f044c7e3b4a8b83be21118288343bfc2
parent80878312316bfb4011157f13cf040f6d885f808b (diff)
downloadcpython-a16387ab2d85f19665920bb6ff91a7e57f59dd2a.zip
cpython-a16387ab2d85f19665920bb6ff91a7e57f59dd2a.tar.gz
cpython-a16387ab2d85f19665920bb6ff91a7e57f59dd2a.tar.bz2
bpo-24564: shutil.copystat(): ignore EINVAL on os.setxattr() (GH-13369)
-rw-r--r--Lib/shutil.py5
-rw-r--r--Misc/NEWS.d/next/Library/2019-05-16-23-40-36.bpo-24564.lIwV_7.rst3
2 files changed, 6 insertions, 2 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py
index b2e8f5f..2dfae87 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -309,7 +309,7 @@ if hasattr(os, 'listxattr'):
try:
names = os.listxattr(src, follow_symlinks=follow_symlinks)
except OSError as e:
- if e.errno not in (errno.ENOTSUP, errno.ENODATA):
+ if e.errno not in (errno.ENOTSUP, errno.ENODATA, errno.EINVAL):
raise
return
for name in names:
@@ -317,7 +317,8 @@ if hasattr(os, 'listxattr'):
value = os.getxattr(src, name, follow_symlinks=follow_symlinks)
os.setxattr(dst, name, value, follow_symlinks=follow_symlinks)
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):
raise
else:
def _copyxattr(*args, **kwargs):
diff --git a/Misc/NEWS.d/next/Library/2019-05-16-23-40-36.bpo-24564.lIwV_7.rst b/Misc/NEWS.d/next/Library/2019-05-16-23-40-36.bpo-24564.lIwV_7.rst
new file mode 100644
index 0000000..27cb617
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-05-16-23-40-36.bpo-24564.lIwV_7.rst
@@ -0,0 +1,3 @@
+: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.