[Bps-public-commit] r10860 - in Shipwright/trunk/lib/Shipwright: Script

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Fri Feb 15 12:36:56 2008
New Revision: 10860

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

Log:
skip in build are hash too now

Modified: Shipwright/trunk/lib/Shipwright/Build.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Build.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Build.pm	Fri Feb 15 12:36:56 2008
@@ -98,7 +98,7 @@
         );
 
         for my $dist ( @{ $self->order } ) {
-            unless ( grep { $dist eq $_ } @{ $self->skip || [] } ) {
+            unless ( $self->skip && $self->skip->{$dist} ) {
                 $self->_install($dist);
             }
             chdir $self->build_base;
@@ -202,7 +202,7 @@
     # then link to it, else link to the normal one
         if (   $type
             && grep( { $_ eq $type } @{ $self->order } )
-            && !( grep { $_ eq $type } @{ $self->skip || [] } )
+            && !( $self->skip && $self->skip->{$type} )
             && -e File::Spec->catfile( '..', 'etc', "shipwright-$type-wrapper" )
           )
         {

Modified: Shipwright/trunk/lib/Shipwright/Script/Build.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Script/Build.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Script/Build.pm	Fri Feb 15 12:36:56 2008
@@ -38,7 +38,7 @@
 
     die "need repository arg" unless $self->repository;
 
-    $self->skip( [ split /\s*,\s*/, $self->skip || '' ] );
+    $self->skip( { map { $_ => 1 } split /\s*,\s*/, $self->skip || '' } );
 
     my $shipwright = Shipwright->new(
         repository => $self->repository,