X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=gitMergeCommon.py;h=ce9694b15ebe131fea9536dc7b2a0f04d9ceca02;hb=ccfd3e99621f489db4ea37a03be7674adbd03f6e;hp=dfa49ff7ec95453d680020866e3c9658b1f77870;hpb=720d150c48fc35fca13c6dfb3c76d60e4ee83b87;p=git.git

diff --git a/gitMergeCommon.py b/gitMergeCommon.py
index dfa49ff7..ce9694b1 100644
--- a/gitMergeCommon.py
+++ b/gitMergeCommon.py
@@ -10,6 +10,10 @@ if sys.version_info[0] < 2 or \
 
 import subprocess
 
+def die(*args):
+    printList(args, sys.stderr)
+    sys.exit(2)
+
 # Debugging machinery
 # -------------------
 
@@ -28,11 +32,11 @@ def debug(*args):
         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
 # -----------------
@@ -42,6 +46,9 @@ class ProgramError(Exception):
         self.progStr = progStr
         self.error = error
 
+    def __str__(self):
+        return self.progStr + ': ' + self.error
+
 addDebug('runProgram')
 def runProgram(prog, input=None, returnCode=False, env=None, pipeOutput=True):
     debug('runProgram prog:', str(prog), 'input:', str(input))