git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f31db3e
)
samba.tests.docs: Write error output from xsltproc to standard out. (cherry picked...
author
Jelmer Vernooij
<jelmer@samba.org>
Sat, 29 Sep 2012 04:40:32 +0000
(21:40 -0700)
committer
Karolin Seeger
<kseeger@samba.org>
Mon, 29 Oct 2012 19:46:10 +0000
(20:46 +0100)
source4/scripting/python/samba/tests/docs.py
patch
|
blob
|
history
diff --git
a/source4/scripting/python/samba/tests/docs.py
b/source4/scripting/python/samba/tests/docs.py
index def759b133fc1a5ce8f698c6548f2345935669f2..d4d4a6249dbefa457a76c3b407e28ea1231e0f72 100644
(file)
--- a/
source4/scripting/python/samba/tests/docs.py
+++ b/
source4/scripting/python/samba/tests/docs.py
@@
-47,7
+47,7
@@
def get_documented_parameters(sourcedir):
try:
p = subprocess.Popen(
["xsltproc", "--xinclude", "--param", "smb.context", "ALL", "generate-context.xsl", "parameters.all.xml"],
- stdout=subprocess.PIPE, cwd=os.path.join(sourcedir, "docs-xml", "smbdotconf"))
+ std
err=subprocess.STDOUT, std
out=subprocess.PIPE, cwd=os.path.join(sourcedir, "docs-xml", "smbdotconf"))
except OSError, e:
if e.errno == errno.ENOENT:
raise NoXsltProc()