[PATCH] Make the ProgramError class printable.

[git.git] / gitMergeCommon.py

diff --git a/gitMergeCommon.py b/gitMergeCommon.py
index 7e7f317119b4a7082e9151053ad28225f151f1aa..ce9694b15ebe131fea9536dc7b2a0f04d9ceca02 100644 (file)
--- 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))