pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint4/files pkgtools/pkglint4: remove brok...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9888068d4ea0
branches:  trunk
changeset: 402251:9888068d4ea0
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Oct 06 10:46:18 2019 +0000

description:
pkgtools/pkglint4: remove broken version check

The version number '4.193.0' had always been compared to the string
'pkglint4-4.193.0', which when interpreted as a version number, was:
(16, 11, 7, 12, 9, 14, 20, 4, 0, 193, 0, 0). This was always greater than
the (4, 0, 193, 0, 0).

diffstat:

 pkgtools/pkglint4/files/pkglint.pl |  33 +--------------------------------
 1 files changed, 1 insertions(+), 32 deletions(-)

diffs (55 lines):

diff -r dfb1f83146a0 -r 9888068d4ea0 pkgtools/pkglint4/files/pkglint.pl
--- a/pkgtools/pkglint4/files/pkglint.pl        Sun Oct 06 10:33:45 2019 +0000
+++ b/pkgtools/pkglint4/files/pkglint.pl        Sun Oct 06 10:46:18 2019 +0000
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.7 2019/10/06 10:33:34 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.8 2019/10/06 10:46:18 rillig Exp $
 #
 
 # pkglint - static analyzer and checker for pkgsrc packages
@@ -1594,35 +1594,6 @@
        return "nb$pkgrevision";
 }
 
-sub check_pkglint_version() {
-       state $done = false;
-       return if $done;
-       $done = true;
-
-       my $lines = load_lines("${cwd_pkgsrcdir}/pkgtools/pkglint4/Makefile", true);
-       return unless $lines;
-
-       my $pkglint_version = undef;
-       foreach my $line (@{$lines}) {
-               if ($line->text =~ regex_varassign) {
-                       my ($varname, undef, $value, undef) = ($1, $2, $3, $4);
-
-                       if ($varname eq "DISTNAME" || $varname eq "PKGNAME") {
-                               if ($value =~ regex_pkgname) {
-                                       $pkglint_version = $2;
-                               }
-                       }
-               }
-       }
-       return unless defined($pkglint_version);
-
-       if (dewey_cmp($pkglint_version, ">", conf_distver)) {
-               log_note(NO_FILE, NO_LINE_NUMBER, "A newer version of pkglint is available.");
-       } elsif (dewey_cmp($pkglint_version, "<", conf_distver)) {
-               log_error(NO_FILE, NO_LINE_NUMBER, "The pkglint version is newer than the tree to check.");
-       }
-}
-
 # When processing a file using the expect* subroutines below, it may
 # happen that $lineno points past the end of the file. In that case,
 # print the warning without associated source code.
@@ -5803,8 +5774,6 @@
                return;
        }
 
-       check_pkglint_version();        # (needs $cwd_pkgsrcdir)
-
        return if $is_dir && is_emptydir($item);
 
        if ($is_dir) {



Home | Main Index | Thread Index | Old Index