summaryrefslogtreecommitdiffstats
path: root/tools/patman
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-08-16 00:59:26 +0900
committerTom Rini <trini@ti.com>2014-08-21 12:01:11 -0400
commit31e2141d5ad76b55e4e34ee7241adc1c3d9ef099 (patch)
tree59661ae5e29aea1057b1a669d54d70f88edb6615 /tools/patman
parent6933b5c9f3b6844b5fc3b81b3c8157cb17eaea3e (diff)
downloadtalos-obmc-uboot-31e2141d5ad76b55e4e34ee7241adc1c3d9ef099.tar.gz
talos-obmc-uboot-31e2141d5ad76b55e4e34ee7241adc1c3d9ef099.zip
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 <yamada.m@jp.panasonic.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/patman')
-rw-r--r--tools/patman/checkpatch.py5
-rwxr-xr-xtools/patman/patman.py3
2 files changed, 3 insertions, 5 deletions
diff --git a/tools/patman/checkpatch.py b/tools/patman/checkpatch.py
index 0d4e935244..34a3bd22b0 100644
--- a/tools/patman/checkpatch.py
+++ b/tools/patman/checkpatch.py
@@ -34,9 +34,8 @@ def FindCheckPatch():
return fname
path = os.path.dirname(path)
- print >> sys.stderr, ('Cannot find checkpatch.pl - please put it in your ' +
- '~/bin directory or use --no-check')
- sys.exit(1)
+ sys.exit('Cannot find checkpatch.pl - please put it in your ' +
+ '~/bin directory or use --no-check')
def CheckPatch(fname, verbose=False):
"""Run checkpatch.pl on a file.
diff --git a/tools/patman/patman.py b/tools/patman/patman.py
index c60aa5a1c4..ba5dc91315 100755
--- a/tools/patman/patman.py
+++ b/tools/patman/patman.py
@@ -122,8 +122,7 @@ else:
col = terminal.Color()
if not options.count:
str = 'No commits found to process - please use -c flag'
- print col.Color(col.RED, str)
- sys.exit(1)
+ sys.exit(col.Color(col.RED, str))
# Read the metadata from the commits
if options.count:
OpenPOWER on IntegriCloud