lkml.org 
[lkml]   [2019]   [Aug]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: [PATCH AUTOSEL 4.19 06/42] scripts/sphinx-pre-install: fix script for RHEL/CentOS
    On Sat, Aug 3, 2019 at 11:19 AM Sasha Levin <sashal@kernel.org> wrote:
    >
    > From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    >
    > [ Upstream commit b308467c916aa7acc5069802ab76a9f657434701 ]
    >
    > There's a missing parenthesis at the script, with causes it to
    > fail to detect non-Fedora releases (e. g. RHEL/CentOS).
    >
    > Tested with Centos 7.6.1810.
    >
    > Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    > Signed-off-by: Sasha Levin <sashal@kernel.org>
    > ---
    > scripts/sphinx-pre-install | 2 +-
    > 1 file changed, 1 insertion(+), 1 deletion(-)
    >
    > diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
    > index 067459760a7b0..3524dbc313163 100755
    > --- a/scripts/sphinx-pre-install
    > +++ b/scripts/sphinx-pre-install
    > @@ -301,7 +301,7 @@ sub give_redhat_hints()
    > #
    > # Checks valid for RHEL/CentOS version 7.x.
    > #
    > - if (! $system_release =~ /Fedora/) {
    > + if (!($system_release =~ /Fedora/)) {
    > $map{"virtualenv"} = "python-virtualenv";
    > }
    >
    > --
    > 2.20.1
    >

    The negated binding operator '!~' could be used here as well, and it
    does not require the use of extra parenthesis.
    Just a thought.

    \
     
     \ /
      Last update: 2019-08-03 12:34    [W:2.593 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site