You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by da...@apache.org on 2011/07/29 21:57:35 UTC

svn commit: r1152358 - /subversion/trunk/tools/dist/backport.pl

Author: danielsh
Date: Fri Jul 29 19:57:35 2011
New Revision: 1152358

URL: http://svn.apache.org/viewvc?rev=1152358&view=rev
Log:
Plug an infinite loop.

* tools/dist/backport.pl
  (parse_entry): Use more liberal regexes.

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=1152358&r1=1152357&r2=1152358&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Fri Jul 29 19:57:35 2011
@@ -152,15 +152,15 @@ sub parse_entry {
   }
 
   # summary
-  push @logsummary, shift until $_[0] =~ /^\w+:/;
+  push @logsummary, shift until $_[0] =~ /^\s*\w+:/;
 
   # votes
-  unshift @votes, pop until $_[-1] =~ /^Votes:/;
+  unshift @votes, pop until $_[-1] =~ /^\s*Votes:/;
   pop;
 
   # branch
   while (@_) {
-    shift and next unless $_[0] =~ s/^Branch:\s*//;
+    shift and next unless $_[0] =~ s/^\s*Branch:\s*//;
     $branch = sanitize_branch (shift || shift || die "Branch header found without value");
   }