[PATCH] Introduce a 'die' function.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
diff --git a/gitMergeCommon.py b/gitMergeCommon.py
index dfa49ff..7e7f317 100644
--- a/gitMergeCommon.py
+++ b/gitMergeCommon.py
@@ -10,6 +10,10 @@
import subprocess
+def die(*args):
+ printList(args, sys.stderr)
+ sys.exit(2)
+
# Debugging machinery
# -------------------
@@ -28,11 +32,11 @@
if funcName in functionsToDebug:
printList(args)
-def printList(list):
+def printList(list, file=sys.stdout):
for x in list:
- sys.stdout.write(str(x))
- sys.stdout.write(' ')
- sys.stdout.write('\n')
+ file.write(str(x))
+ file.write(' ')
+ file.write('\n')
# Program execution
# -----------------