Fix lock file cleanup if there's an error early in startup.

doc/CHANGES.rst

@@ -8,6 +8,8 @@ http://docs.zope.org/zope2/releases/.
 2.13.15 (unreleased)
 --------------------
 
+- Fix lock file cleanup if there's an error early in startup.
+
 
 2.13.14 (2012-05-31)
 --------------------

src/Zope2/Startup/__init__.py

@@ -303,7 +303,7 @@ class ZopeStarter:
                 pass
 
     def unlinkLockFile(self):
-        if not self.cfg.zserver_read_only_mode:
+        if not self.cfg.zserver_read_only_mode and hasattr(self, 'lockfile'):
             try:
                 self.lockfile.close()
                 os.unlink(self.cfg.lock_filename)

src/Zope2/Startup/run.py

@@ -20,8 +20,9 @@ def run():
     starter.setConfiguration(opts.configroot)
     try:
         starter.prepare()
-    finally:
+    except:
         starter.shutdown()
+        raise
     starter.run()
 
 def configure(configfile):