Allow '+' in branch names

We now uri_escape the branch name for transmmission. The server
needs to do the same, otherwise the signature breaks.

diff --git a/EximBuild/SCM.pm b/EximBuild/SCM.pm
index becd24e037ea73a6c7e3b65bf3434180763b3a07..a722f3d8e642ed926f6a7ecb4749bb87efdefd04 100644 (file)
--- a/EximBuild/SCM.pm
+++ b/EximBuild/SCM.pm
@@ -213,7 +213,7 @@ sub checkout
         
         chdir $target;
         my @branches = `git branch 2>&1`;
         
         chdir $target;
         my @branches = `git branch 2>&1`;

-        unless (grep {/^\* bf_$branch$/} @branches)
+        unless (grep {/^\* bf_\Q$branch\E$/} @branches)

         {
             chdir '..';
             print "Missing checked out branch bf_$branch:\n",@branches
         {
             chdir '..';
             print "Missing checked out branch bf_$branch:\n",@branches

diff --git a/EximBuild/WebTxn.pm b/EximBuild/WebTxn.pm
index f71f55a27074eef87bc64ec396e48b9dafd76dee..455cd45c818de7f76797914ed0d4e0d5a10db46d 100644 (file)
--- a/EximBuild/WebTxn.pm
+++ b/EximBuild/WebTxn.pm
@@ -14,6 +14,7 @@ needed on older Msys installations (i.e. things running perl < 5.8).
 =cut 
 
 use strict;
 =cut 
 
 use strict;

+use URI::Escape;

 
 use vars qw($VERSION); $VERSION = 'REL_0.1';
 
 
 use vars qw($VERSION); $VERSION = 'REL_0.1';
 


@@ -99,7 +100,7 @@ sub run_web_txn
     my $content =
         "changed_files=$changed_this_run&"
       . "changed_since_success=$changed_since_success&"
     my $content =
         "changed_files=$changed_this_run&"
       . "changed_since_success=$changed_since_success&"

-      ."branch=$branch&res=$status&stage=$stage&animal=$animal&ts=$ts"
+      . 'branch=' . uri_escape($branch) . "&res=$status&stage=$stage&animal=$animal&ts=$ts"

       ."&log=$log_data&conf=$confsum";
     my $sig= sha1_hex($content,$secret);
 
       ."&log=$log_data&conf=$confsum";
     my $sig= sha1_hex($content,$secret);