Commit 4c2c8008 authored by Hanno Schlichting's avatar Hanno Schlichting

Don't catch Ctrl-C during startup

parent 020fd5c6
...@@ -599,6 +599,8 @@ def import_product(product_dir, product_name, raise_exc=0, log_exc=1): ...@@ -599,6 +599,8 @@ def import_product(product_dir, product_name, raise_exc=0, log_exc=1):
if not have_module(k): if not have_module(k):
if type(v) is _st and have_module(v): v=modules[v] if type(v) is _st and have_module(v): v=modules[v]
modules[k]=v modules[k]=v
except KeyboardInterrupt:
raise
except: except:
exc = sys.exc_info() exc = sys.exc_info()
if log_exc: if log_exc:
...@@ -723,6 +725,8 @@ def install_product(app, product_dir, product_name, meta_types, ...@@ -723,6 +725,8 @@ def install_product(app, product_dir, product_name, meta_types,
transaction.get().note('Installed product '+product_name) transaction.get().note('Installed product '+product_name)
transaction.commit() transaction.commit()
except KeyboardInterrupt:
raise
except: except:
if log_exc: if log_exc:
LOG.error('Couldn\'t install %s' % product_name, LOG.error('Couldn\'t install %s' % product_name,
...@@ -750,7 +754,8 @@ def install_package(app, module, init_func, raise_exc=False, log_exc=True): ...@@ -750,7 +754,8 @@ def install_package(app, module, init_func, raise_exc=False, log_exc=True):
else: else:
transaction.get().note('Installed package %s' % module.__name__) transaction.get().note('Installed package %s' % module.__name__)
transaction.commit() transaction.commit()
except KeyboardInterrupt:
raise
except: except:
if log_exc: if log_exc:
LOG.error("Couldn't install %s" % module.__name__, LOG.error("Couldn't install %s" % module.__name__,
......
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