diff options
| author | rillig <rillig@pkgsrc.org> | 2022-08-18 18:26:46 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2022-08-18 18:26:46 +0000 |
| commit | 966009773b6c6d83250c6df1a81f01e7b6690aff (patch) | |
| tree | 2e92f88eade124734a3ed2805a9b7ee13a0be053 /pkgtools | |
| parent | 3423afe0690b62f68880a99f8fc7eacd55a41267 (diff) | |
| download | pkgsrc-966009773b6c6d83250c6df1a81f01e7b6690aff.tar.gz | |
lintpkgsrc: cleanup: replace '|| fail' with 'or fail'
Diffstat (limited to 'pkgtools')
| -rwxr-xr-x | pkgtools/lintpkgsrc/files/lintpkgsrc.pl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl index 00d1ab214ae..0e56a7d9e4e 100755 --- a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl +++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl @@ -1,5 +1,5 @@ #!@PERL5@ -# $NetBSD: lintpkgsrc.pl,v 1.121 2022/08/18 18:13:23 rillig Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.122 2022/08/18 18:26:46 rillig Exp $ # Written by David Brownlee <abs@netbsd.org>. # @@ -232,7 +232,7 @@ sub listdir($base, $dir = undef) { $dir = ''; } - opendir(DIR, $thisdir) || fail("Unable to opendir($thisdir): $!"); + opendir(DIR, $thisdir) or fail("Unable to opendir($thisdir): $!"); @thislist = grep { substr($_, 0, 1) ne '.' && $_ ne 'CVS' } readdir(DIR); closedir(DIR); foreach my $entry (@thislist) { @@ -798,7 +798,7 @@ sub list_installed_packages() { sub list_pkgsrc_categories($pkgsrcdir) { my @categories; - opendir(BASE, $pkgsrcdir) || die("Unable to opendir($pkgsrcdir): $!"); + opendir(BASE, $pkgsrcdir) or die("Unable to opendir($pkgsrcdir): $!"); @categories = grep { !/^\./ && -f "$pkgsrcdir/$_/Makefile" } readdir(BASE); closedir(BASE); @@ -1218,9 +1218,9 @@ sub check_pkgsrc_distfiles_vs_distinfo($pkgsrcdir, $pkgdistdir, $check_unref, } my $pid = open3(my $in, my $out, undef, 'xargs', 'digest', $sum); - defined $pid || fail 'fork'; + defined $pid or fail 'fork'; my $pid2 = fork(); - defined $pid2 || fail 'fork'; + defined $pid2 or fail 'fork'; if ($pid2) { close($in) or die; } else { @@ -1236,8 +1236,8 @@ sub check_pkgsrc_distfiles_vs_distinfo($pkgsrcdir, $pkgdistdir, $check_unref, } } close($out) or die; - waitpid($pid, 0) || fail "xargs digest $sum"; - waitpid($pid2, 0) || fail 'pipe write to xargs'; + waitpid($pid, 0) or fail "xargs digest $sum"; + waitpid($pid2, 0) or fail 'pipe write to xargs'; } chdir_or_fail($prev_dir); } |