Merge trunk r128097 and r128098. Windows lock/pid file fixes

zopefoundation · Oct 21, 2012 · 52ad803 · 52ad803
1 parent 41ea8b4
commit 52ad803
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/doc/CHANGES.rst b/doc/CHANGES.rst
@@ -14,6 +14,10 @@ http://docs.zope.org/zope2/releases/.
 
   - 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)
 --------------------
 

diff --git a/src/Zope2/Startup/__init__.py b/src/Zope2/Startup/__init__.py
@@ -292,7 +292,7 @@ def makePidFile(self):
                 f = open(self.cfg.pid_filename, 'w')
                 f.write(str(os.getpid()))
                 f.close()
-            except IOError:
+            except (IOError, WindowsError):
                 pass
 
     def unlinkPidFile(self):