summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/mailmapper3
-rwxr-xr-xscripts/multiconfig.py7
2 files changed, 2 insertions, 8 deletions
diff --git a/scripts/mailmapper b/scripts/mailmapper
index dd1ddf6..922ada6 100755
--- a/scripts/mailmapper
+++ b/scripts/mailmapper
@@ -59,8 +59,7 @@ MIN_COMMITS = 50
try:
toplevel = subprocess.check_output(['git', 'rev-parse', '--show-toplevel'])
except subprocess.CalledProcessError:
- print >> sys.stderr, 'Please run in a git repository.'
- sys.exit(1)
+ sys.exit('Please run in a git repository.')
# strip '\n'
toplevel = toplevel.rstrip()
diff --git a/scripts/multiconfig.py b/scripts/multiconfig.py
index 749abcb..69a470e 100755
--- a/scripts/multiconfig.py
+++ b/scripts/multiconfig.py
@@ -194,11 +194,6 @@ def rmdirs(*dirs):
exception.errno != errno.ENOTEMPTY:
raise
-def error(msg):
- """Output the given argument to stderr and exit with return code 1."""
- print >> sys.stderr, msg
- sys.exit(1)
-
def run_command(command, callback_on_error=None):
"""Run the given command in a sub-shell (and exit if it fails).
@@ -211,7 +206,7 @@ def run_command(command, callback_on_error=None):
if retcode:
if callback_on_error:
callback_on_error()
- error("'%s' Failed" % command)
+ sys.exit("'%s' Failed" % command)
def run_make_config(cmd, objdir, callback_on_error=None):
"""Run the make command in a sub-shell (and exit if it fails).