[Zope-Checkins] CVS: Zope/lib/python - zope.py:1.1.2.8

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python
In directory cvs.zope.org:/tmp/cvs-serv26251

Modified Files:
      Tag: chrism-install-branch
	zope.py 
Log Message:
Merging chrism-install-branch with HEAD (hopefully for one of the last
times).

CVg: Committing in .


=== Zope/lib/python/zope.py 1.1.2.7 => 1.1.2.8 ===
--- Zope/lib/python/zope.py:1.1.2.7	Thu Jan  2 11:53:33 2003
+++ Zope/lib/python/zope.py	Fri Jan  3 01:28:57 2003
@@ -85,17 +85,16 @@
     dn = os.path.dirname
     configure(config_location, overrides)
 
-    # start Zope
-##     try:
-    from Startup import start_zope
-    start_zope()
-##     except SystemExit:
-##         raise
-##     except ConfigurationError, err:
-##         log_error(str(err))
-##         # tell zdaemon not to restart us by setting zero exit code
-##         sys.exit(0)
-##     except:
-##         log_error('Unknown error', sys.exc_info())
-##         # tell zdaemon not to restart us by setting zero exit code
-##         sys.exit(0)
+    try:
+        from Startup import start_zope
+        start_zope()
+    except SystemExit:
+        raise
+    except ConfigurationError, err:
+        log_error(str(err))
+        # tell zdaemon not to restart us by setting zero exit code
+        sys.exit(0)
+    except:
+        log_error('Unknown error', sys.exc_info())
+        # tell zdaemon not to restart us by setting zero exit code
+        sys.exit(0)