[PATCH] Use the 'die' function where it is appropriate.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen committed
Sep 13, 2005 at 23:41 UTC
daae66994967ba503f5e868eddf6962a2c1d7871
1 file changed
+13
-14
gitMergeCommon.py
+13
-14
@@ -1,19 +1,24 @@
1
import sys, re, os, traceback
2
from sets import Set
3
4
+def die(*args):
5
+ printList(args, sys.stderr)
6
+ sys.exit(2)
7
+
8
+def printList(list, file=sys.stdout):
9
+ for x in list:
10
+ file.write(str(x))
11
+ file.write(' ')
12
+ file.write('\n')
13
+
14
if sys.version_info[0] < 2 or \
15
(sys.version_info[0] == 2 and sys.version_info[1] < 4):
6
- print 'Python version 2.4 required, found', \
7
- str(sys.version_info[0])+'.'+str(sys.version_info[1])+'.'+ \
8
- str(sys.version_info[2])
9
- sys.exit(1)
16
+ die('Python version 2.4 required, found', \
17
+ str(sys.version_info[0])+'.'+str(sys.version_info[1])+'.'+ \
18
+ str(sys.version_info[2]))
19
20
import subprocess
21
13
-def die(*args):
14
- printList(args, sys.stderr)
15
- sys.exit(2)
16
-
22
# Debugging machinery
23
# -------------------
24
@@ -32,12 +37,6 @@ def debug(*args):
37
if funcName in functionsToDebug:
38
printList(args)
39
35
-def printList(list, file=sys.stdout):
36
- for x in list:
37
- file.write(str(x))
38
- file.write(' ')
39
- file.write('\n')
40
-
40
# Program execution
41
# -----------------
42