summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-01-06 18:29:05 +0000
committerAntoine Pitrou <solipsis@pitrou.net>2011-01-06 18:29:05 +0000
commitff17385fbde2b4fcd5d309e14904a9a27a742b8c (patch)
tree2c5737d2801a4d5dc140b7850482a378eefb59fc
parent8ad4cd90e97c1ab272c9a047a91539b13d6addf7 (diff)
downloadcpython-git-ff17385fbde2b4fcd5d309e14904a9a27a742b8c.tar.gz
Merged revisions 87802 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87802 | antoine.pitrou | 2011-01-06 19:25:55 +0100 (jeu., 06 janv. 2011) | 6 lines Issue #7858: Raise an error properly when os.utime() fails under Windows on an existing file. (this does not seem to be easily testable) ........
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/posixmodule.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index c326855814..4f01ca2c3f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,9 @@ Core and Builtins
Library
-------
+- Issue #7858: Raise an error properly when os.utime() fails under Windows
+ on an existing file.
+
- Issue #3839: wsgiref should not override a Content-Length header set by
the application. Initial patch by Clovis Fabricio.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index cb94898025..870c0ea85e 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -3031,6 +3031,7 @@ posix_utime(PyObject *self, PyObject *args)
something is wrong with the file, when it also
could be the time stamp that gives a problem. */
win32_error("utime", NULL);
+ goto done;
}
Py_INCREF(Py_None);
result = Py_None;