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. ........
This commit is contained in:
parent
ca2edce676
commit
910bd51ea1
|
@ -11,6 +11,7 @@ from os.path import abspath
|
||||||
import fnmatch
|
import fnmatch
|
||||||
from warnings import warn
|
from warnings import warn
|
||||||
import collections
|
import collections
|
||||||
|
import errno
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from pwd import getpwnam
|
from pwd import getpwnam
|
||||||
|
@ -105,8 +106,11 @@ def copystat(src, dst):
|
||||||
if hasattr(os, 'chmod'):
|
if hasattr(os, 'chmod'):
|
||||||
os.chmod(dst, mode)
|
os.chmod(dst, mode)
|
||||||
if hasattr(os, 'chflags') and hasattr(st, 'st_flags'):
|
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):
|
def copy(src, dst):
|
||||||
"""Copy data and mode bits ("cp src dst").
|
"""Copy data and mode bits ("cp src dst").
|
||||||
|
|
|
@ -287,6 +287,10 @@ C-API
|
||||||
Library
|
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 #7860: platform.uname now reports the correct 'machine' type
|
- Issue #7860: platform.uname now reports the correct 'machine' type
|
||||||
when Python is running in WOW64 mode on 64 bit Windows.
|
when Python is running in WOW64 mode on 64 bit Windows.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue