commit 4e48fe3f1c42519f1aad92176489eeb174a319c0
author Fredrik Kuivinen <freku045@student.liu.se> Mon Sep 12 23:31:56 2005 +0200
committer Junio C Hamano <junkio@cox.net> Mon Sep 12 14:54:00 2005 -0700
tree 3f4857cb791c5c085ee3c666fc0911a3df3b0a12
parent 206e587cb8ab22a9d264c20fb6299124a857281a

[PATCH] Make the ProgramError class printable.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitMergeCommon.py

diff --git a/gitMergeCommon.py b/gitMergeCommon.py
index 7e7f317..ce9694b 100644
--- a/gitMergeCommon.py
+++ b/gitMergeCommon.py
@@ -46,6 +46,9 @@
         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))