Received: by mail.netbsd.org (Postfix, from userid 605) id AC97B84F63; Tue, 16 Aug 2022 19:20:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E58A684E81 for ; Tue, 16 Aug 2022 19:20:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id Ib4vcd0YKCG3 for ; Tue, 16 Aug 2022 19:20:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 6A3B584D22 for ; Tue, 16 Aug 2022 19:20:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5E58DFB1A; Tue, 16 Aug 2022 19:20:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_166067760648240" MIME-Version: 1.0 Date: Tue, 16 Aug 2022 19:20:06 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/pkgtools/lintpkgsrc/files To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20220816192006.5E58DFB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_166067760648240 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Tue Aug 16 19:20:06 UTC 2022 Modified Files: pkgsrc/pkgtools/lintpkgsrc/files: lintpkgsrc.pl Log Message: lintpkgsrc: cleanup: rename subroutine Scanning the distfiles is not the main action. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_166067760648240 Content-Disposition: inline Content-Length: 1422 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl diff -u pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.101 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.102 --- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.101 Tue Aug 16 19:15:43 2022 +++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl Tue Aug 16 19:20:06 2022 @@ -1,5 +1,5 @@ #!@PERL5@ -# $NetBSD: lintpkgsrc.pl,v 1.101 2022/08/16 19:15:43 rillig Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.102 2022/08/16 19:20:06 rillig Exp $ # Written by David Brownlee . # @@ -1143,10 +1143,10 @@ sub check_distinfo_hash($entry, $pkgpath } } -# Extract all distinfo entries, then verify contents of distfiles -# -sub scan_pkgsrc_distfiles_vs_distinfo($pkgsrcdir, $pkgdistdir, $check_unref, - $check_distinfo) { +# Verify that the contents of the distfiles directory matches the distinfo +# files in the packages. +sub check_pkgsrc_distfiles_vs_distinfo($pkgsrcdir, $pkgdistdir, $check_unref, + $check_distinfo) { my (@categories); my (%distfiles, %sumfiles, @distwarn, $numpkg); my (%unref_distfiles); @@ -1376,7 +1376,7 @@ sub debug_parse_makefiles(@args) { } sub check_distfiles($pkgsrcdir, $pkgdistdir) { - my @unref_distfiles = scan_pkgsrc_distfiles_vs_distinfo( + my @unref_distfiles = check_pkgsrc_distfiles_vs_distinfo( $pkgsrcdir, $pkgdistdir, $opt{o}, $opt{m}); return unless $opt{r}; --_----------=_166067760648240--