[Python-checkins] r87804 - in python/branches/release27-maint: Misc/NEWS Modules/posixmodule.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Thu Jan  6 19:30:26 2011
New Revision: 87804

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


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Misc/NEWS
   python/branches/release27-maint/Modules/posixmodule.c

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Thu Jan  6 19:30:26 2011
@@ -25,6 +25,9 @@
 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.
 

Modified: python/branches/release27-maint/Modules/posixmodule.c
==============================================================================
--- python/branches/release27-maint/Modules/posixmodule.c	(original)
+++ python/branches/release27-maint/Modules/posixmodule.c	Thu Jan  6 19:30:26 2011
@@ -2843,6 +2843,7 @@
            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;