Merge trunk@128087. Windows lock file fix.

41ea8b4f · Ross Patterson · 382c95ae · 41ea8b4f
Commit 41ea8b4f authored Oct 21, 2012 by Ross Patterson
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

src/Zope2/Startup/__init__.py src/Zope2/Startup/__init__.py +1 -1

No files found.
--- a/src/Zope2/Startup/__init__.py
+++ b/src/Zope2/Startup/__init__.py
@@ -280,7 +280,7 @@ class ZopeStarter:
                lock_file(self.lockfile)
                self.lockfile.write(str(os.getpid()))
                self.lockfile.flush()
-            except IOError:
+            except (IOError, WindowsError):
                pass

    def makePidFile(self):