linux-doc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Corbet <corbet@lwn.net>
To: Sebastian Muxel <sebastian@muxel.dev>,
	Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
	Sebastian Muxel <sebastian@muxel.dev>
Subject: Re: [PATCH] scripts: sphinx-pre-install: remove unnecessary double check for $cur_version
Date: Thu, 05 Sep 2024 14:32:47 -0600	[thread overview]
Message-ID: <8734mdhmds.fsf@trenco.lwn.net> (raw)
In-Reply-To: <20240827133224.160776-1-sebastian@muxel.dev>

Sebastian Muxel <sebastian@muxel.dev> writes:

> $cur_version is currently being tested twice with the first test
> resulting in an unhelpful "$sphinx returned an error", not continuing to
> the more helpful "$sphinx didn't return its version".
>
> This patch removes the first test to return the more useful message.
>
> Fixes: a8b380c379ef ("scripts: sphinx-pre-install: only ask to activate valid venvs")
> Signed-off-by: Sebastian Muxel <sebastian@muxel.dev>
> ---
>  scripts/sphinx-pre-install | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
> index c1121f098542..ad9945ccb0cf 100755
> --- a/scripts/sphinx-pre-install
> +++ b/scripts/sphinx-pre-install
> @@ -300,8 +300,6 @@ sub check_sphinx()
>  	}
>  
>  	$cur_version = get_sphinx_version($sphinx);
> -	die ("$sphinx returned an error") if (!$cur_version);
> -
>  	die "$sphinx didn't return its version" if (!$cur_version);

Applied, thanks.

jon

      reply	other threads:[~2024-09-05 20:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-27 13:32 [PATCH] scripts: sphinx-pre-install: remove unnecessary double check for $cur_version Sebastian Muxel
2024-09-05 20:32 ` Jonathan Corbet [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8734mdhmds.fsf@trenco.lwn.net \
    --to=corbet@lwn.net \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=sebastian@muxel.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).