Author: aconway
Date: Tue Feb 10 16:44:33 2015
New Revision: 1658758
URL: http://svn.apache.org/r1658758
Log:
NO-JIRA: Add program output to exception in check_output for old python
Modified:
qpid/dispatch/trunk/doc/man/help2md.py
qpid/dispatch/trunk/python/qpid_dispatch_internal/compat/subproc.py
Modified: qpid/dispatch/trunk/doc/man/help2md.py
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/doc/man/help2md.py?rev=1658758&r1=1658757&r2=1658758&view=diff
==============================================================================
--- qpid/dispatch/trunk/doc/man/help2md.py (original)
+++ qpid/dispatch/trunk/doc/man/help2md.py Tue Feb 10 16:44:33 2015
@@ -27,7 +27,7 @@ or append it at the end if there is no #
"""
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
+
Modified: qpid/dispatch/trunk/python/qpid_dispatch_internal/compat/subproc.py
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch_internal/compat/subproc.py?rev=1658758&r1=1658757&r2=1658758&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch_internal/compat/subproc.py
(original)
+++ qpid/dispatch/trunk/python/qpid_dispatch_internal/compat/subproc.py Tue Feb
10 16:44:33 2015
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
