[Zope-Checkins] SVN: Zope/trunk/src/OFS/Application.py Don't catch Ctrl-C during startup
Hanno Schlichting
hannosch at hannosch.eu
Tue Mar 30 16:25:30 EDT 2010
Log message for revision 110338:
Don't catch Ctrl-C during startup
Changed:
U Zope/trunk/src/OFS/Application.py
-=-
Modified: Zope/trunk/src/OFS/Application.py
===================================================================
--- Zope/trunk/src/OFS/Application.py 2010-03-30 20:13:39 UTC (rev 110337)
+++ Zope/trunk/src/OFS/Application.py 2010-03-30 20:25:30 UTC (rev 110338)
@@ -599,6 +599,8 @@
if not have_module(k):
if type(v) is _st and have_module(v): v=modules[v]
modules[k]=v
+ except KeyboardInterrupt:
+ raise
except:
exc = sys.exc_info()
if log_exc:
@@ -723,6 +725,8 @@
transaction.get().note('Installed product '+product_name)
transaction.commit()
+ except KeyboardInterrupt:
+ raise
except:
if log_exc:
LOG.error('Couldn\'t install %s' % product_name,
@@ -750,7 +754,8 @@
else:
transaction.get().note('Installed package %s' % module.__name__)
transaction.commit()
-
+ except KeyboardInterrupt:
+ raise
except:
if log_exc:
LOG.error("Couldn't install %s" % module.__name__,
More information about the Zope-Checkins
mailing list