[Python-checkins] r79300 - in python/branches/release26-maint: Lib/shutil.py Misc/NEWS

[antoine.pitrou]

Author: antoine.pitrou
Date: Mon Mar 22 21:03:59 2010
New Revision: 79300

Log:
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.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/shutil.py
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Lib/shutil.py
==============================================================================
--- python/branches/release26-maint/Lib/shutil.py	(original)
+++ python/branches/release26-maint/Lib/shutil.py	Mon Mar 22 21:03:59 2010
@@ -9,6 +9,7 @@
 import stat
 from os.path import abspath
 import fnmatch
+import errno
 
 __all__ = ["copyfileobj","copyfile","copymode","copystat","copy","copy2",
            "copytree","move","rmtree","Error"]
@@ -74,8 +75,11 @@
     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, why:
+            if not hasattr(errno, 'EOPNOTSUPP') or why.errno != errno.EOPNOTSUPP:
+                raise
 
 def copy(src, dst):
     """Copy data and mode bits ("cp src dst").

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Mon Mar 22 21:03:59 2010
@@ -23,6 +23,10 @@
 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 #6544: fix a reference leak in the kqueue implementation's error