[Bps-public-commit] r10442 - bpsbuilder/Shipwright/lib/Shipwright/Script

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Wed Jan 23 07:41:45 2008
New Revision: 10442

Modified:
   bpsbuilder/Shipwright/lib/Shipwright/Script/Import.pm

Log:
we need more strict way to find dist dir

Modified: bpsbuilder/Shipwright/lib/Shipwright/Script/Import.pm
==============================================================================
--- bpsbuilder/Shipwright/lib/Shipwright/Script/Import.pm	(original)
+++ bpsbuilder/Shipwright/lib/Shipwright/Script/Import.pm	Wed Jan 23 07:41:45 2008
@@ -142,7 +142,7 @@
                 $dist =~ s/::/-/g;
 
                 unless ( $imported{$dist}++ ) {
-                    my $s = ( grep { /^$dist/ } @sources )[0];
+                    my ($s) = grep { $_ eq $dist } @sources;
                     warn "we don't have $dist in source which is for "
                       . $self->source
                       unless $s;
@@ -154,7 +154,7 @@
                     move(
                         File::Spec->catfile( $s,          '__require.yml' ),
                         File::Spec->catfile( $script_dir, 'require.yml' )
-                    );
+                    ) or die "move $s/__require.yml failed: $!";
 
                     $self->generate_build( $s, $script_dir, $shipwright );