[Bps-public-commit] r11356 - Shipwright/trunk/lib/Shipwright

sunnavy at bestpractical.com sunnavy at bestpractical.com
Tue Apr 1 21:25:54 EDT 2008


Author: sunnavy
Date: Tue Apr  1 21:25:54 2008
New Revision: 11356

Modified:
   Shipwright/trunk/lib/Shipwright/Build.pm

Log:
trivial

Modified: Shipwright/trunk/lib/Shipwright/Build.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Build.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Build.pm	Tue Apr  1 21:25:54 2008
@@ -33,6 +33,7 @@
       File::Spec->catfile( tempdir( CLEANUP => 0 ), 'build' );
 
     $self->name('vessel') unless $self->name;
+    $self->skip( {} ) unless $self->skip;
 
     unless ( $self->install_base ) {
 
@@ -102,12 +103,11 @@
               || []
         );
 
-        my $flags = {};
 
         if ( -e File::Spec->catfile( 'shipwright', 'flags.yml' ) ) {
 
-            $flags = Shipwright::Util::LoadFile(
-                File::Spec->catfile( 'shipwright', 'flags.yml' ) );
+            $self->flags( Shipwright::Util::LoadFile(
+                File::Spec->catfile( 'shipwright', 'flags.yml' ) ) || {} );
         }
 
         unless ( $self->perl && -e $self->perl ) {
@@ -132,10 +132,10 @@
 
         for my $dist ( @{ $self->order } ) {
 
-            # $flags->{$dist} is undef means 'default', will be installed
+            # $self->flags->{$dist} is undef means 'default', will be installed
             next
-              if $flags->{$dist} && !grep { $self->flags->{$_} }
-                  @{ $flags->{$dist} };
+              if $self->flags->{$dist} && !grep { $self->flags->{$_} }
+                  @{ $self->flags->{$dist} };
 
             unless ( $self->skip && $self->skip->{$dist} ) {
                 $self->_install($dist);
@@ -251,6 +251,7 @@
             my $base    = quotemeta $self->install_base;
             my $perl    = quotemeta $self->perl;
 
+            return unless $shebang;
             if ( $shebang =~ m{$perl} ) {
                 $type = 'perl';
             }



More information about the Bps-public-commit mailing list