From: Fredrik Kuivinen Date: Mon, 12 Sep 2005 21:31:56 GMT Subject: [PATCH 5/5] Make the ProgramError class printable. Message-ID: <20050912213156.GG6644@c165.ib.student.liu.se> In-Reply-To: <20050912212601.GB6644@c165.ib.student.liu.se> Signed-off-by: Fredrik Kuivinen --- gitMergeCommon.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) 30c12b2a8d3df83b15952f786327ccd0c3c04554 diff --git a/gitMergeCommon.py b/gitMergeCommon.py --- a/gitMergeCommon.py +++ b/gitMergeCommon.py @@ -46,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))