Thu Aug 11 18:55:35 2022 UTC ()

lintpkgsrc: use proper exit status when showing usage


(rillig)

diff -r1.75 -r1.76 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl

--- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl 2022/08/11 07:20:52 1.75
+++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl 2022/08/11 18:55:35 1.76

 @@ -1,16 +1,16 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.75 2022/08/11 07:20:52 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.76 2022/08/11 18:55:35 rillig Exp $
 # Written by David Brownlee <abs@netbsd.org>.
+#
 # Caveats:
 #	The 'Makefile parsing' algorithm used to obtain package versions and
 #	DEPENDS information is geared towards speed rather than perfection,
 #	though it has gotten somewhat better over time, it only parses the
 #	simpler Makefile conditionals.
+#
 # TODO: Handle fun DEPENDS like avifile-devel with
 #			{qt2-designer>=2.2.4,qt2-designer-kde>=2.3.1nb1}
 use v5.36;
 @@ -1249,27 +1249,27 @@ sub store_pkgsrc_makefiles($db, $fname)
 			$varname =~ /^\S+$/
 			    or die "cannot store variable name '$varname'\n";
 			$value =~ /^.*$/
 			    or die "cannot store variable value '$value'\n";
 			print STORE "var\t$varname\t$value\n";
+		}
+	}
 	close(STORE)
 	    or die("Cannot save pkgsrc store to $fname: $!\n");
+}
 # Remember to update manual page when modifying option list
+#
-sub usage_and_exit() {
+sub usage_and_exit($status) {
 	print "Usage: lintpkgsrc [opts] [makefiles]
 opts:
   -h : This help.	 [see lintpkgsrc(1) for more information]
 Installed package options:		Distfile options:
   -i : Check version against pkgsrc	  -m : List distinfo mismatches
   -u : As -i + fetch dist (may change)	  -o : List obsolete (no distinfo)
 					  -y : Remove orphan distfiles
 					  -z : Remove installed distfiles
 Prebuilt package options:		Makefile options:
   -p : List old/obsolete		  -B : List packages marked as 'BROKEN'
   -O : List OSVERSION_SPECIFIC		  -d : Check 'DEPENDS' up to date
 @@ -1278,27 +1278,27 @@ Prebuilt package options:		Makefile opti
 Misc:
   -E file : Export the internal pkgsrc database to file
   -I file : Import the internal pkgsrc database to file (for use with -i)
   -g file : Generate 'pkgname pkgdir pkgver' map in file
   -r	  : Remove bad files (Without -m -o -p or -V implies all, can use -R)
 Modifiers:
   -K path : Set PACKAGES basedir (default PKGSRCDIR/packages)
   -M path : Set DISTDIR		 (default PKGSRCDIR/distfiles)
   -P path : Set PKGSRCDIR	 (default $conf_pkgsrcdir)
   -D      : Debug makefile and glob parsing
   -L      : List each Makefile when scanned
 ";
-	exit;
+	exit $status;
+}
 # Could speed up by building a cache of package names to paths, then processing
 # each package name once against the tests.
 sub check_prebuilt_packages() {
 	if ($_ eq 'distfiles' || $_ eq 'pkgsrc') {
 		# Skip these subdirs if present
 		$File::Find::prune = 1;
 	} elsif (/(.+)-(\d.*)\.t[bg]z$/) {
 		my ($pkg, $ver) = ($1, $2);
 @@ -1598,27 +1598,27 @@ sub check_outdated_installed_packages($p
 		system("$conf_make fetch-list | sh");
+	}
+}
 sub main() {
 	$ENV{PATH} .=
 	    ":/bin:/usr/bin:/sbin:/usr/sbin:$conf_prefix/sbin:$conf_prefix/bin";
 	if (
 	    !getopts('BDE:I:K:LM:OP:RSVdg:himopruyz', \%opt)
 		|| $opt{h}
 		|| !grep(/[BDEORSdgimopruyz]/, keys %opt)) {
-		usage_and_exit();
+		usage_and_exit($opt{h} ? 0 : 1);
+	}
 	$| = 1;
 	get_default_makefile_vars(); # $default_vars
 	if ($opt{D} && @ARGV) {
 		debug_parse_makefiles(@ARGV);
 		exit;
+	}
 	my $pkgsrcdir = $default_vars->{PKGSRCDIR};
 	my $pkgdistdir = $default_vars->{DISTDIR};