diff options
Diffstat (limited to 'gitMergeCommon.py')
| -rw-r--r-- | gitMergeCommon.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gitMergeCommon.py b/gitMergeCommon.py index 7e7f317119..ce9694b15e 100644 --- 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)) |