From 4e48fe3f1c42519f1aad92176489eeb174a319c0 Mon Sep 17 00:00:00 2001
From: Fredrik Kuivinen <freku045@student.liu.se>
Date: Mon, 12 Sep 2005 23:31:56 +0200
Subject: [PATCH] [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 | 3 +++
 1 file changed, 3 insertions(+)

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))
-- 
2.11.4.GIT