diff options
| -rwxr-xr-x | admin/check_dup_commits | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/admin/check_dup_commits b/admin/check_dup_commits index e2aa083..5c5cb3c 100755 --- a/admin/check_dup_commits +++ b/admin/check_dup_commits @@ -17,14 +17,15 @@ while(<$pipe>) { } close $pipe; +$bad = 0; for(sort keys %builds) { my $count = $builds{$_}; $count < 2 && next; print "$_: has $count local commits\n"; - $ret++; + $ret++; $bad++; } -print " Fix these, rebase, and do a git push -f\n\n" if $ret; +print " Fix these, rebase, and do a git push -f\n\n" if $bad; open $pipe, "-|", "elinks -dump-width 500 -dump -no-numbering -no-references https://slackbuilds.org/ready/"; while(<$pipe>) { @@ -40,21 +41,24 @@ while(<$pipe>) { } close $pipe; +$bad = 0; for(sort keys %builds) { my $count = $rbuilds{$_}; if($count) { print "$_: has $builds{$_} local and $count remote commits\n"; - $ret++; + $ret++; $bad++; } } -print " Remove local commits, rebase, and do a git push -f\n\n" if $ret; +print " Remove local commits, rebase, and do a git push -f\n\n" if $bad; +$bad = 0; for(sort keys %rbuilds) { my $count = $rbuilds{$_}; $count < 2 && next; print "$_: has $count remote commits\n"; + $ret++; $bad++; } -print " Let Willy know he should fix these.\n" if $ret; +print " Let Willy know he should fix these.\n" if $bad; exit $ret ? 1 : 0; |