summaryrefslogtreecommitdiff
path: root/gitMergeCommon.py
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2005-09-12 21:31:56 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-12 21:54:00 (GMT)
commit4e48fe3f1c42519f1aad92176489eeb174a319c0 (patch)
tree3f4857cb791c5c085ee3c666fc0911a3df3b0a12 /gitMergeCommon.py
parent206e587cb8ab22a9d264c20fb6299124a857281a (diff)
downloadgit-4e48fe3f1c42519f1aad92176489eeb174a319c0.zip
git-4e48fe3f1c42519f1aad92176489eeb174a319c0.tar.gz
git-4e48fe3f1c42519f1aad92176489eeb174a319c0.tar.bz2
[PATCH] Make the ProgramError class printable.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'gitMergeCommon.py')
-rw-r--r--gitMergeCommon.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/gitMergeCommon.py b/gitMergeCommon.py
index 7e7f317..ce9694b 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))