[PATCH] Make the ProgramError class printable.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen committed
Sep 12, 2005 at 23:31 UTC
4e48fe3f1c42519f1aad92176489eeb174a319c0
1 file changed
+3
gitMergeCommon.py
+3
@@ -46,6 +46,9 @@ class ProgramError(Exception):
46
self.progStr = progStr
47
self.error = error
48
49
+ def __str__(self):
50
+ return self.progStr + ': ' + self.error
51
+
52
addDebug('runProgram')
53
def runProgram(prog, input=None, returnCode=False, env=None, pipeOutput=True):
54
debug('runProgram prog:', str(prog), 'input:', str(input))