Update suggested minimum config

[buildfarm-client.git] / EximBuild / SCM.pm

diff --git a/EximBuild/SCM.pm b/EximBuild/SCM.pm
index becd24e037ea73a6c7e3b65bf3434180763b3a07..9b006cd1b899b07b9bd46f2c2560cadc15beb6bf 100644 (file)
--- a/EximBuild/SCM.pm
+++ b/EximBuild/SCM.pm
@@ -1,6 +1,7 @@
 use strict;
 
 use File::Find;
 use strict;
 
 use File::Find;

+use Cwd;

 
 =comment
 
 
 =comment
 


@@ -8,7 +9,7 @@ Copyright (c) 2003-2010, Andrew Dunstan
 
 See accompanying License file for license details
 
 
 See accompanying License file for license details
 

-=cut 
+=cut

 
 ##########################################################################
 #
 
 ##########################################################################
 #


@@ -210,15 +211,15 @@ sub checkout
             unshift @ret, "git not found in path\n";
             main::send_result("$target-Git",$status,\@ret);
         }
             unshift @ret, "git not found in path\n";
             main::send_result("$target-Git",$status,\@ret);
         }

-        
+

         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
               if ($main::verbose);
         {
             chdir '..';
             print "Missing checked out branch bf_$branch:\n",@branches
               if ($main::verbose);

-            unshift @branches,"Missing checked out branch bf_$branch:\n";
+            unshift @branches,"Missing checked out branch bf_$branch in " . cwd() . ":\n";

             main::send_result("$target-Git",$status,\@branches);
         }
         my @pulllog = `git pull 2>&1`;
             main::send_result("$target-Git",$status,\@branches);
         }
         my @pulllog = `git pull 2>&1`;