From c8173f14a3f9a09b11955150772e0352cd9bc6b0 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Tue, 10 Feb 2015 16:44:33 +0000
Subject: [PATCH 06/10] NO-JIRA: Add program output to exception in
 check_output for old python

git-svn-id: https://svn.apache.org/repos/asf/qpid/dispatch/trunk@1658758 13f79535-47bb-0310-9956-ffa450edef68
---
 doc/man/help2md.py                              | 10 ++++++++--
 python/qpid_dispatch_internal/compat/subproc.py |  4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/doc/man/help2md.py b/doc/man/help2md.py
index 1032388..b43d76e 100644
--- a/doc/man/help2md.py
+++ b/doc/man/help2md.py
@@ -27,7 +27,7 @@ or append it at the end if there is no # Options section.
 """
 
 import re, sys
-from qpid_dispatch_internal.compat.subproc import check_output, STDOUT
+from qpid_dispatch_internal.compat.subproc import check_output, STDOUT, CalledProcessError
 from os import path
 
 def help2md(help_out):
@@ -63,4 +63,10 @@ def main(argv):
     open(target, "w").write(upcase_md)
 
 if __name__ == "__main__":
-    main(sys.argv)
+    try:
+        main(sys.argv)
+    except CalledProcessError, e:
+        if hasattr(e, "output") and e.output:
+            print "\n%s\n\n%s\n" % (e, e.output)
+        raise
+
diff --git a/python/qpid_dispatch_internal/compat/subproc.py b/python/qpid_dispatch_internal/compat/subproc.py
index 69a511d..7927961 100644
--- a/python/qpid_dispatch_internal/compat/subproc.py
+++ b/python/qpid_dispatch_internal/compat/subproc.py
@@ -38,5 +38,7 @@ except ImportError:
         p = Popen(args, stdout=PIPE, stdin=stdin, stderr=stderr, shell=shell, universal_newlines=universal_newlines, **kwargs)
         out, err = p.communicate()
         if p.returncode:
-            raise CalledProcessError(p.returncode, args)
+            e = CalledProcessError(p.returncode, args)
+            e.output = err or out
+            raise e
         return out
-- 
2.1.0