Commit 52ad803b authored by Ross Patterson's avatar Ross Patterson

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

parent 41ea8b4f
...@@ -14,6 +14,10 @@ http://docs.zope.org/zope2/releases/. ...@@ -14,6 +14,10 @@ http://docs.zope.org/zope2/releases/.
- tempstorage = 2.12.2 - 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) 2.13.18 (2012-09-18)
-------------------- --------------------
......
...@@ -292,7 +292,7 @@ class ZopeStarter: ...@@ -292,7 +292,7 @@ class ZopeStarter:
f = open(self.cfg.pid_filename, 'w') f = open(self.cfg.pid_filename, 'w')
f.write(str(os.getpid())) f.write(str(os.getpid()))
f.close() f.close()
except IOError: except (IOError, WindowsError):
pass pass
def unlinkPidFile(self): def unlinkPidFile(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment