From patchwork Mon Jun 22 14:00:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 71978 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8DDB2A0519; Mon, 22 Jun 2020 16:00:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B8CB51D6F4; Mon, 22 Jun 2020 16:00:14 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id E82791D6F1 for ; Mon, 22 Jun 2020 16:00:12 +0200 (CEST) IronPort-SDR: UMGHS8thO252Qk0uv92Kyt8oUFUC+m0Hrq3p/N/0sEljkMow6Pml/lBYXtznSlHDv1HRDF48az cmrw2EN392NQ== X-IronPort-AV: E=McAfee;i="6000,8403,9659"; a="145271041" X-IronPort-AV: E=Sophos;i="5.75,267,1589266800"; d="scan'208";a="145271041" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2020 07:00:11 -0700 IronPort-SDR: yd19dmHILsBdfwtuhZRRxNn1uoyhvl0XmFuzvxiKusvowX8OtMrTwwdlZc1zV0DEsjOkd73Qmi vk7vzy7oybGQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,267,1589266800"; d="scan'208";a="292855999" Received: from silpixa00399126.ir.intel.com ([10.237.222.84]) by orsmga002.jf.intel.com with ESMTP; 22 Jun 2020 07:00:10 -0700 From: Bruce Richardson To: david.marchand@redhat.com Cc: dev@dpdk.org, Bruce Richardson Date: Mon, 22 Jun 2020 15:00:02 +0100 Message-Id: <20200622140002.555035-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200117104820.71403-1-bruce.richardson@intel.com> References: <20200117104820.71403-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2] doc: fix doc build when sphinx reports version to stderr X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" When sphinx-build reports its version information to stderr rather than stdout, the wrapper script misses it, and then fails to run. We can fix this by redirecting stderr to stdout for the version query call. Fixes: f5ab2074cfba ("doc: rebuild with meson whenever a file changes") Signed-off-by: Bruce Richardson Tested-by: Ciara Power Tested-by: David Marchand --- V2: no changes to this patch, dropped patch 2 from series. --- buildtools/call-sphinx-build.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/buildtools/call-sphinx-build.py b/buildtools/call-sphinx-build.py index b9a3994e1..85c9e0156 100755 --- a/buildtools/call-sphinx-build.py +++ b/buildtools/call-sphinx-build.py @@ -6,13 +6,14 @@ import sys import os from os.path import join -from subprocess import run, PIPE +from subprocess import run, PIPE, STDOUT from distutils.version import StrictVersion (sphinx, src, dst) = sys.argv[1:] # assign parameters to variables # for sphinx version >= 1.7 add parallelism using "-j auto" -ver = run([sphinx, '--version'], stdout=PIPE).stdout.decode().split()[-1] +ver = run([sphinx, '--version'], stdout=PIPE, + stderr=STDOUT).stdout.decode().split()[-1] sphinx_cmd = [sphinx] if StrictVersion(ver) >= StrictVersion('1.7'): sphinx_cmd += ['-j', 'auto']