Author: danielsh Date: Thu Feb 2 13:08:23 2012 New Revision: 1239595 URL: http://svn.apache.org/viewvc?rev=1239595&view=rev Log: * tools/dist/backport.pl (handle_entry): Skip vetoed entries in batch mode.
Modified: subversion/trunk/tools/dist/backport.pl Modified: subversion/trunk/tools/dist/backport.pl URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1239595&r1=1239594&r2=1239595&view=diff ============================================================================== --- subversion/trunk/tools/dist/backport.pl (original) +++ subversion/trunk/tools/dist/backport.pl Thu Feb 2 13:08:23 2012 @@ -180,6 +180,7 @@ sub parse_entry { sub handle_entry { my %entry = parse_entry @_; + my @vetoes = grep { /^ -1:/ } @{$entry{votes}}; print ""; print "\n>>> The $entry{header}:"; @@ -190,11 +191,11 @@ sub handle_entry { print ""; print for @{$entry{votes}}; print ""; - print "Vetoes found!" if grep { /^ -1:/ } @{$entry{votes}}; + print "Vetoes found!" if @vetoes; # TODO: this changes ./STATUS, which we're reading below, but # on my system the loop in main() doesn't seem to care. - merge %entry if $ENV{YES} or prompt; + merge %entry if $ENV{YES} ? !@vetoes : prompt; 1; }