linux-kernel - Re: [PATCH v2 1/2] scripts/sphinx-pre-install: allow checking for multiple missing files

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20191002104438.1131e911@coco.lan>
Date:   Wed, 2 Oct 2019 10:44:38 -0300
From:   Mauro Carvalho Chehab <mchehab+samsung@...nel.org>
To:     Jeremy MAURO <jeremy.mauro@...il.com>
Cc:     j.mauro@...teo.com, Jonathan Corbet <corbet@....net>,
        linux-doc@...r.kernel.org (open list:DOCUMENTATION SCRIPTS),
        linux-kernel@...r.kernel.org (open list)
Subject: Re: [PATCH v2 1/2] scripts/sphinx-pre-install: allow checking for
 multiple missing files

Em Wed,  2 Oct 2019 15:33:39 +0200
Jeremy MAURO <jeremy.mauro@...il.com> escreveu:

> The current implementation take a simple file as first argument, this
> change allows to take a list as a first argument.
> 
> Some file could have a different path according distribution version
> 
> Signed-off-by: Jeremy MAURO <j.mauro@...teo.com>

Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@...nel.org>

> ---
> Changes in v2:
> - Change the commit message
> 
>  scripts/sphinx-pre-install | 20 +++++++++++---------
>  1 file changed, 11 insertions(+), 9 deletions(-)
> 
> diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
> index 3b638c0e1a4f..b5077ae63a4b 100755
> --- a/scripts/sphinx-pre-install
> +++ b/scripts/sphinx-pre-install
> @@ -124,11 +124,13 @@ sub add_package($$)
>  
>  sub check_missing_file($$$)
>  {
> -	my $file = shift;
> +	my $files = shift;
>  	my $package = shift;
>  	my $is_optional = shift;
>  
> -	return if(-e $file);
> +	for (@$files) {
> +		return if(-e $_);
> +	}
>  
>  	add_package($package, $is_optional);
>  }
> @@ -343,10 +345,10 @@ sub give_debian_hints()
>  	);
>  
>  	if ($pdf) {
> -		check_missing_file("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
> +		check_missing_file(["/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"],
>  				   "fonts-dejavu", 2);
>  
> -		check_missing_file("/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
> +		check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc"],
>  				   "fonts-noto-cjk", 2);
>  	}
>  
> @@ -413,7 +415,7 @@ sub give_redhat_hints()
>  	}
>  
>  	if ($pdf) {
> -		check_missing_file("/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc",
> +		check_missing_file(["/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc"],
>  				   "google-noto-sans-cjk-ttc-fonts", 2);
>  	}
>  
> @@ -498,7 +500,7 @@ sub give_mageia_hints()
>  	$map{"latexmk"} = "texlive-collection-basic";
>  
>  	if ($pdf) {
> -		check_missing_file("/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc",
> +		check_missing_file(["/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc"],
>  				   "google-noto-sans-cjk-ttc-fonts", 2);
>  	}
>  
> @@ -528,7 +530,7 @@ sub give_arch_linux_hints()
>  	check_pacman_missing(\@archlinux_tex_pkgs, 2) if ($pdf);
>  
>  	if ($pdf) {
> -		check_missing_file("/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
> +		check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc"],
>  				   "noto-fonts-cjk", 2);
>  	}
>  
> @@ -549,11 +551,11 @@ sub give_gentoo_hints()
>  		"rsvg-convert"		=> "gnome-base/librsvg",
>  	);
>  
> -	check_missing_file("/usr/share/fonts/dejavu/DejaVuSans.ttf",
> +	check_missing_file(["/usr/share/fonts/dejavu/DejaVuSans.ttf"],
>  			   "media-fonts/dejavu", 2) if ($pdf);
>  
>  	if ($pdf) {
> -		check_missing_file("/usr/share/fonts/noto-cjk/NotoSansCJKsc-Regular.otf",
> +		check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJKsc-Regular.otf"],
>  				   "media-fonts/noto-cjk", 2);
>  	}
>  



Thanks,
Mauro