diff options
| author | Fredrik Kuivinen <freku045@student.liu.se> | 2005-09-12 23:31:56 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-12 14:54:00 -0700 |
| commit | 4e48fe3f1c42519f1aad92176489eeb174a319c0 (patch) | |
| tree | 3f4857cb791c5c085ee3c666fc0911a3df3b0a12 | |
| parent | 206e587cb8ab22a9d264c20fb6299124a857281a (diff) | |
| download | git-4e48fe3f1c42519f1aad92176489eeb174a319c0.tar.gz git-4e48fe3f1c42519f1aad92176489eeb174a319c0.tar.xz | |
[PATCH] Make the ProgramError class printable.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | gitMergeCommon.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gitMergeCommon.py b/gitMergeCommon.py index 7e7f31711..ce9694b15 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)) |