From c11266721adcfed6be82ec16fec43adbc2f5ffa1 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Sun, 5 Jan 2020 02:05:23 +0000 Subject: Tools/scripts/bump_revision.pl: Fix a few issues - When using a non-default ports tree (-p PATH), strip that from the requisite origins, too. - Fix the counters when multiple ports are given on the command line, i. e. we are bumping depends if more requisites are updated at once. --- Tools/scripts/bump_revision.pl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Tools') diff --git a/Tools/scripts/bump_revision.pl b/Tools/scripts/bump_revision.pl index b417731b351d..fc3826bb07ab 100755 --- a/Tools/scripts/bump_revision.pl +++ b/Tools/scripts/bump_revision.pl @@ -160,8 +160,8 @@ my %index = (); $port = $b[-2]."/".$b[-1]; - @{ $index{$port} }{'portname', 'portnameversion', 'portdir', 'comment', 'deps'} - = ($b[-1], $a[0], $a[1], $a[3], ()); + @{ $index{$port} }{'portname', 'portnameversion', 'origin', 'comment', 'deps'} + = ($b[-1], $a[0], $port, $a[3], ()); if ($a[8]) { @b = split(" ", $a[8]); @@ -202,13 +202,15 @@ foreach my $PORT (@ARGV) { # { print "Searching for ports depending on $PORT\n"; + my $count = 0; foreach my $p (keys(%index)) { if (defined $index{$p}{'deps'}{$PORTNAMEVERSION}) { $DEPPORTS{$p} = 1; + ++$count; } } - print "- Found ", scalar keys(%DEPPORTS), " ports depending on $PORT.\n"; + print "- Found $count ports depending on $PORT.\n"; } } @@ -221,7 +223,7 @@ sub direct_dependency($@) { my @lines = ; chomp @lines; my $deps = join(" ", @lines); - my %deps = map { $_ =~ s[/usr/ports/][]; ($_ => 1) } split " ", $deps; + my %deps = map { $_ =~ s[/usr/ports/][]; $_ =~ s[$portsdir/][]; ($_ => 1) } split " ", $deps; if ($!) { die "cannot read depends from make: $!"; } close F or die "cannot read depends from make: $!"; my $required = grep { $_ } map { defined $deps{$_} } @requisites; -- cgit v1.2.3