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)
........

diff --git a/Misc/NEWS b/Misc/NEWS
index c3268558143ee7a1952ddb15295959a9d843354d..4f01ca2c3fdcdade7757ff09e28b4f5b181878d2 100644 (file)
--- 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 cb948980250828b49a101da28d7bc556531477c6..870c0ea85eaa8f7887c5a8eaaf86422bc5f9c1a3 100644 (file)
--- 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;