From 616b0b297a7383b5c77c8b886aaf62f37c2a8c95 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 3 Mar 2011 17:12:27 -0500 Subject: in subp, put output and stderr into the raised error --- cloudinit/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudinit/util.py b/cloudinit/util.py index 3a40cc99..fc4233de 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -147,7 +147,7 @@ def subp(args, input=None): sp = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=s_in) out,err = sp.communicate(input) if sp.returncode is not 0: - raise subprocess.CalledProcessError(sp.returncode,args) + raise subprocess.CalledProcessError(sp.returncode,args, (out,err)) return(out,err) def render_to_file(template, outfile, searchList): -- cgit v1.2.3