[Bps-public-commit] r13316 - in Shipwright/trunk: . share/bin

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Sat Jun 14 09:38:21 2008
New Revision: 13316

Modified:
   Shipwright/trunk/   (props changed)
   Shipwright/trunk/lib/Shipwright/Build.pm
   Shipwright/trunk/share/bin/shipwright-builder

Log:
 r13399 at sunnavys-mb:  sunnavy | 2008-06-14 07:17:48 +0800
 fixed an order buy


Modified: Shipwright/trunk/lib/Shipwright/Build.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Build.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Build.pm	Sat Jun 14 09:38:21 2008
@@ -126,7 +126,9 @@
         else {
             @$order =
               grep {
-                ( $flags->{$_} ? $self->flags->{$_} : 1 )
+                ( $flags->{$_}
+                    ? ( grep { $self->flags->{$_} } @{ $flags->{$_} } )
+                    : 1 )
                   && !$self->skip->{$_}
               } @$order;
         }

Modified: Shipwright/trunk/share/bin/shipwright-builder
==============================================================================
--- Shipwright/trunk/share/bin/shipwright-builder	(original)
+++ Shipwright/trunk/share/bin/shipwright-builder	Sat Jun 14 09:38:21 2008
@@ -88,6 +88,7 @@
     map { $_ => 1 } split /\s*,\s*/, $args{flags} || ''
 };
 
+
 $args{with} = { map { split /=/ } split /\s*,\s*/, $args{with} || '' };
 
 if ( $args{only} ) {
@@ -119,10 +120,13 @@
 }
 else {
     @$order =
-      grep { ( $flags->{$_} ? $args{flags}{$_} : 1 ) && !$args{skip}->{$_} }
-      @$order;
+      grep {
+        ( $flags->{$_} ? ( grep { $args{flags}{$_} } @{ $flags->{$_} } ) : 1 )
+          && !$args{skip}->{$_}
+      } @$order;
 }
 
+
 my $log;
 
 if ( $args{'only-test'} ) {