]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
scripts: sphinx-pre-install: improve openSuse Tumbleweed check
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Tue, 14 Apr 2020 16:56:09 +0000 (18:56 +0200)
committerJonathan Corbet <corbet@lwn.net>
Mon, 20 Apr 2020 21:19:12 +0000 (15:19 -0600)
Currently, with openSUSE Tumbleweed 20200303, it keeps
recommending this forever:

sudo zypper install --no-recommends rsvg-view

This dependency will never be fulfilled there, as the package
now is named as on other distros: rsvg-convert.

So, improve the detection to avoid such issue.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/c3774f72ac36c5e5b5f446ae5db5b795d1f274f4.1586883286.git.mchehab+huawei@kernel.org
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
scripts/sphinx-pre-install

index ea941c6e06479ae92c09d4a49c64bd3c362f4402..6d6d2849fbb13400047d2264e74d7fc0732f1963 100755 (executable)
@@ -446,9 +446,11 @@ sub give_opensuse_hints()
                "convert"               => "ImageMagick",
                "Pod::Usage"            => "perl-Pod-Usage",
                "xelatex"               => "texlive-xetex-bin",
-               "rsvg-convert"          => "rsvg-view",
        );
 
+       # On Tumbleweed, this package is also named rsvg-convert
+       $map{"rsvg-convert"} = "rsvg-view" if (!($system_release =~ /Tumbleweed/));
+
        my @suse_tex_pkgs = (
                "texlive-babel-english",
                "texlive-caption",