From 31e2141d5ad76b55e4e34ee7241adc1c3d9ef099 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sat, 16 Aug 2014 00:59:26 +0900 Subject: tools, scripts: refactor error-out statements of Python scripts In Python, sys.exit() function can also take an object other than an integer. If an integer is given to the argument, Python exits with the return code of it. If a non-integer argument is given, Python outputs it to stderr and exits with the return code of 1. That means, print >> sys.stderr, "Blah Blah" sys.exit(1) is equivalent to sys.exit("Blah Blah") The latter is a useful shorthand. Note: Some error messages in Buildman and Patman were output to stdout. But they should go to stderr. They are also fixed by this commit. This is a nice side effect. Signed-off-by: Masahiro Yamada Acked-by: Simon Glass --- scripts/mailmapper | 3 +-- scripts/multiconfig.py | 7 +------ 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'scripts') diff --git a/scripts/mailmapper b/scripts/mailmapper index dd1ddf6a71..922ada6f5f 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 749abcb7a5..69a470e51f 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). -- cgit v1.2.1