[pyfai] 02/02: debug help2man via stderr

[Frédéric-Emmanuel Picca]

This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch master
in repository pyfai.

commit 28090606da3c87c5da24c8fecb3388c6e1c8191e
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Fri Sep 1 17:58:20 2017 +0200

    debug help2man via stderr
---
 debian/changelog                                   |  1 +
 ...05-send-the-help2man-stderr-to-the-stdout.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cf24c7b..c00ed3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ pyfai (0.14.0+dfsg-1) UNRELEASED; urgency=medium
     - 0003-remove-a-wrong-PYTHONPATH-modification.patch  (Added)
     - 0003-use-the-system-mathjax.patch (Added)
     - 0004-unactivated-a-bunch-of-failling-tests.patch (Added)
+    - 0005-send-the-help2man-stderr-to-the-stdout.patch (Added)
   * Debian/rules
     - Run tests with xvfb
 
diff --git a/debian/patches/0005-send-the-help2man-stderr-to-the-stdout.patch b/debian/patches/0005-send-the-help2man-stderr-to-the-stdout.patch
new file mode 100644
index 0000000..43c0151
--- /dev/null
+++ b/debian/patches/0005-send-the-help2man-stderr-to-the-stdout.patch
@@ -0,0 +1,22 @@
+From: =?utf-8?q?Picca_Fr=C3=83=C2=A9d=C3=83=C2=A9ric-Emmanuel?=
+ <picca at synchrotron-soleil.fr>
+Date: Fri, 1 Sep 2017 17:57:20 +0200
+Subject: send the help2man stderr to the stdout
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 090676a..2a42dcf 100644
+--- a/setup.py
++++ b/setup.py
+@@ -239,7 +239,7 @@ class BuildMan(Command):
+                     # stderr to print the version
+                     command_line.append("--no-discard-stderr")
+ 
+-                p = subprocess.Popen(command_line, env=env)
++                p = subprocess.Popen(command_line, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                 status = p.wait()
+                 if status != 0:
+                     raise RuntimeError("Fail to generate '%s' man documentation" % target_name)
diff --git a/debian/patches/series b/debian/patches/series
index 0f99d39..5b0ea18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-remove-useless-logic-in-conf.py.patch
 0003-remove-a-wrong-PYTHONPATH-modification.patch
 0004-unactivated-a-bunch-of-failling-tests.patch
+0005-send-the-help2man-stderr-to-the-stdout.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyfai.git