summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--module/setup.py4
-rwxr-xr-xpyLoadCore.py4
2 files changed, 2 insertions, 6 deletions
diff --git a/module/setup.py b/module/setup.py
index 91153fc82..abb162e0f 100644
--- a/module/setup.py
+++ b/module/setup.py
@@ -24,7 +24,6 @@ from os.path import abspath
from os.path import dirname
from os.path import exists
from os.path import join
-import re
from subprocess import PIPE
from subprocess import call
import sys
@@ -390,9 +389,6 @@ class Setup():
noaction = False
elif action == "4":
break
- except KeyboardInterrupt:
- print "" #clean
- pass
finally:
if not noaction:
db.shutdown()
diff --git a/pyLoadCore.py b/pyLoadCore.py
index 25d623df6..2bcfde3c8 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -278,11 +278,11 @@ class Core(object):
except SystemExit:
pass
except KeyboardInterrupt:
- print _("Setup interrupted")
+ print "\nSetup interrupted"
except:
res = False
print_exc()
- print _("Setup failed")
+ print "Setup failed"
if not res:
remove("pyload.conf")