[PATCH 5/5] Use the 'die' function where it is appropriate.
From: Fredrik Kuivinen <hidden>
Date: 2016-06-15 22:42:06
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Fredrik Kuivinen <redacted> --- gitMergeCommon.py | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) bd535d629be12d94648a40c2feb89cf14482f772
diff --git a/gitMergeCommon.py b/gitMergeCommon.py
--- a/gitMergeCommon.py
+++ b/gitMergeCommon.py@@ -1,19 +1,24 @@ import sys, re, os, traceback from sets import Set +def die(*args): + printList(args, sys.stderr) + sys.exit(2) + +def printList(list, file=sys.stdout): + for x in list: + file.write(str(x)) + file.write(' ') + file.write('\n') + if sys.version_info[0] < 2 or \ (sys.version_info[0] == 2 and sys.version_info[1] < 4): - print 'Python version 2.4 required, found', \ - str(sys.version_info[0])+'.'+str(sys.version_info[1])+'.'+ \ - str(sys.version_info[2]) - sys.exit(1) + die('Python version 2.4 required, found', \ + str(sys.version_info[0])+'.'+str(sys.version_info[1])+'.'+ \ + str(sys.version_info[2])) import subprocess -def die(*args): - printList(args, sys.stderr) - sys.exit(2) - # Debugging machinery # -------------------
@@ -32,12 +37,6 @@ def debug(*args): if funcName in functionsToDebug: printList(args) -def printList(list, file=sys.stdout): - for x in list: - file.write(str(x)) - file.write(' ') - file.write('\n') - # Program execution # -----------------