[Bps-public-commit] Shipwright branch, master, updated. cbe99bfb371c168af2b7a8d6c7a219df6c2ee1a2

[sunnavy at bestpractical.com]

The branch, master has been updated
       via  cbe99bfb371c168af2b7a8d6c7a219df6c2ee1a2 (commit)
      from  1cfd0afaaf546e81a0518634fe5c48432e1121f0 (commit)

Summary of changes:
 lib/Shipwright/Source/Base.pm |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit cbe99bfb371c168af2b7a8d6c7a219df6c2ee1a2
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Mar 12 14:50:42 2010 +0800

    incase no requirement

diff --git a/lib/Shipwright/Source/Base.pm b/lib/Shipwright/Source/Base.pm
index 3311110..0926670 100644
--- a/lib/Shipwright/Source/Base.pm
+++ b/lib/Shipwright/Source/Base.pm
@@ -160,7 +160,7 @@ sub _follow {
             my $source = read_file( catfile( '_build', 'prereqs' ) )
               or confess "can't read _build/prereqs: $!";
             my $eval = '$require = ' . $source;
-            eval $eval or confess "eval error: $@";    ## no critic
+            eval "$eval;1" or confess "eval error: $@";    ## no critic
 
             $source = read_file( catfile('Build.PL') )
               or confess "can't read Build.PL: $!";
@@ -339,7 +339,8 @@ EOF
                   if $? || !-e 'Makefile';
                 my $prereqs = read_file( catfile('shipwright_prereqs') )
                   or confess "can't read prereqs: $!";
-                eval $prereqs or confess "eval error: $@";    ## no critic
+                  $self->log->error( "prereqs: $prereqs" );
+                eval "$prereqs;1;" or confess "eval error: $@";    ## no critic
 
                 unlink 'shipwright_makefile.pl', 'shipwright_prereqs';
             }
@@ -361,7 +362,7 @@ EOF
                 if ( $source && $source =~ /({.*})/ ) {
                     my $eval .= '$require = ' . $1;
                     $eval =~ s/([\w:]+)=>/'$1'=>/g;
-                    eval $eval or confess "eval error: $@";    ## no critic
+                    eval "$eval;1" or confess "eval error: $@";    ## no critic
                 }
 
                 for ( keys %$require ) {

-----------------------------------------------------------------------