[Zope-Checkins] SVN: Zope/branches/2.13/ Merge trunk r128097 and r128098. Windows lock/pid file fixes

[Ross Patterson]

Log message for revision 128099:
  Merge trunk r128097 and r128098.  Windows lock/pid file fixes
  

Changed:
  U   Zope/branches/2.13/doc/CHANGES.rst
  U   Zope/branches/2.13/src/Zope2/Startup/__init__.py

-=-
Modified: Zope/branches/2.13/doc/CHANGES.rst
===================================================================
--- Zope/branches/2.13/doc/CHANGES.rst	2012-10-21 15:53:10 UTC (rev 128098)
+++ Zope/branches/2.13/doc/CHANGES.rst	2012-10-21 15:57:56 UTC (rev 128099)
@@ -14,6 +14,10 @@
 
   - tempstorage = 2.12.2
 
+- Fix lock and pid file handling on Windows.  On other platforms
+  starting Zope tolerated existing or locked files, this now also
+  works on Windows.
+
 2.13.18 (2012-09-18)
 --------------------
 

Modified: Zope/branches/2.13/src/Zope2/Startup/__init__.py
===================================================================
--- Zope/branches/2.13/src/Zope2/Startup/__init__.py	2012-10-21 15:53:10 UTC (rev 128098)
+++ Zope/branches/2.13/src/Zope2/Startup/__init__.py	2012-10-21 15:57:56 UTC (rev 128099)
@@ -292,7 +292,7 @@
                 f = open(self.cfg.pid_filename, 'w')
                 f.write(str(os.getpid()))
                 f.close()
-            except IOError:
+            except (IOError, WindowsError):
                 pass
 
     def unlinkPidFile(self):