[Bps-public-commit] r13017 - in Shipwright/trunk: .

sunnavy at bestpractical.com sunnavy at bestpractical.com
Sat Jun 7 02:02:05 EDT 2008


Author: sunnavy
Date: Sat Jun  7 02:02:05 2008
New Revision: 13017

Modified:
   Shipwright/trunk/   (props changed)
   Shipwright/trunk/lib/Shipwright/Build.pm

Log:
 r13070 at sunnavys-mb:  sunnavy | 2008-06-07 14:01:50 +0800
 wrong usage of $self->flags


Modified: Shipwright/trunk/lib/Shipwright/Build.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Build.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Build.pm	Sat Jun  7 02:02:05 2008
@@ -103,14 +103,13 @@
               || []
         );
 
+        my $flags;
         if ( -e File::Spec->catfile( 'shipwright', 'flags.yml' ) ) {
 
-            $self->flags(
-                Shipwright::Util::LoadFile(
-                    File::Spec->catfile( 'shipwright', 'flags.yml' )
-                  )
-                  || {}
-            );
+            $flags =
+              Shipwright::Util::LoadFile(
+                File::Spec->catfile( 'shipwright', 'flags.yml' ) )
+              || {};
         }
 
         unless ( $self->perl && -e $self->perl ) {
@@ -121,7 +120,9 @@
             if (
                 (
                     ( grep { $_ eq 'perl' } @{ $self->order } )
-                    && ( $self->only ? $self->only->{perl} : !$self->skip->{perl} )
+                    && (  $self->only
+                        ? $self->only->{perl}
+                        : !$self->skip->{perl} )
                 )
                 || -e $perl
               )
@@ -135,10 +136,10 @@
 
         for my $dist ( @{ $self->order } ) {
 
-            # $self->flags->{$dist} is undef means 'default', will be installed
+            # $flags->{$dist} is undef means 'default', will be installed
             next
               if $self->flags->{$dist} && !grep { $self->flags->{$_} }
-                  @{ $self->flags->{$dist} };
+                  @{ $flags->{$dist} };
 
             if ( $self->only ) {
                 $self->_install($dist) if $self->only->{$dist};



More information about the Bps-public-commit mailing list