[Bps-public-commit] r10448 - bpsbuilder/Shipwright/lib/Shipwright

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Wed Jan 23 10:07:38 2008
New Revision: 10448

Modified:
   bpsbuilder/Shipwright/lib/Shipwright/Backend.pm

Log:
set perl unless it has been set already

Modified: bpsbuilder/Shipwright/lib/Shipwright/Backend.pm
==============================================================================
--- bpsbuilder/Shipwright/lib/Shipwright/Backend.pm	(original)
+++ bpsbuilder/Shipwright/lib/Shipwright/Backend.pm	Wed Jan 23 10:07:38 2008
@@ -157,11 +157,15 @@
 }
 
 my $order = parse_order( File::Spec->catfile( 'shipwright', 'order.yml' ) );
-if ( grep { $_ eq 'perl' } @$order ) {
-    $args{perl} = File::Spec->catfile($args{'install-base'}, 'bin', 'perl');
-}
-else {
-    $args{perl} = $^X;
+
+unless ( $args{perl} ) {
+    if ( grep { $_ eq 'perl' } @$order ) {
+        $args{perl} =
+          File::Spec->catfile( $args{'install-base'}, 'bin', 'perl' );
+    }
+    else {
+        $args{perl} = $^X;
+    }
 }
 
 $args{skip} = [ split /,\s*/, $args{skip} || '' ];