From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 22 Mar 2010 20:12:40 +0000 (+0000)
Subject: Merged revisions 79301 via svnmerge from
X-Git-Tag: v3.1.3rc1~1038
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f274b1fab8b8ebd6d555dd99d75ebc9bb1f91bd;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 79301 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79301 | antoine.pitrou | 2010-03-22 21:11:09 +0100 (lun., 22 mars 2010) | 11 lines

  Merged revisions 79299 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79299 | antoine.pitrou | 2010-03-22 20:59:46 +0100 (lun., 22 mars 2010) | 5 lines

    Issue #7512: shutil.copystat() could raise an OSError when the filesystem
    didn't support chflags() (for example ZFS under FreeBSD).  The error is
    now silenced.
  ........
................
---

diff --git a/Lib/shutil.py b/Lib/shutil.py
index dc36820dc9a7..78504b9d3fb3 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -9,6 +9,7 @@ import sys
 import stat
 from os.path import abspath
 import fnmatch
+import errno
 
 __all__ = ["copyfileobj","copyfile","copymode","copystat","copy","copy2",
            "copytree","move","rmtree","Error", "SpecialFileError"]
@@ -88,8 +89,11 @@ def copystat(src, dst):
     if hasattr(os, 'chmod'):
         os.chmod(dst, mode)
     if hasattr(os, 'chflags') and hasattr(st, 'st_flags'):
-        os.chflags(dst, st.st_flags)
-
+        try:
+            os.chflags(dst, st.st_flags)
+        except OSError as why:
+            if not hasattr(errno, 'EOPNOTSUPP') or why.errno != errno.EOPNOTSUPP:
+                raise
 
 def copy(src, dst):
     """Copy data and mode bits ("cp src dst").
diff --git a/Misc/NEWS b/Misc/NEWS
index 1c329dd26621..f82919b43fd7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -17,6 +17,10 @@ Core and Builtins
 Library
 -------
 
+- Issue #7512: shutil.copystat() could raise an OSError when the filesystem
+  didn't support chflags() (for example ZFS under FreeBSD).  The error is
+  now silenced.
+
 - Issue #3890: Fix recv() and recv_into() on non-blocking SSL sockets.
 
 - Issue #6716/2: Backslash-replace error output in compilall.