[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>
This commit is contained in:
parent
6511cce24b
commit
daae669949
@ -1,19 +1,24 @@
|
||||
import sys, re, os, traceback
|
||||
from sets import Set
|
||||
|
||||
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)
|
||||
|
||||
import subprocess
|
||||
|
||||
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):
|
||||
die('Python version 2.4 required, found', \
|
||||
str(sys.version_info[0])+'.'+str(sys.version_info[1])+'.'+ \
|
||||
str(sys.version_info[2]))
|
||||
|
||||
import subprocess
|
||||
|
||||
# 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
|
||||
# -----------------
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user