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

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Thu Jan 24 05:01:29 2008
New Revision: 10464

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

Log:
catch up

Modified: bpsbuilder/Shipwright/lib/Shipwright/Backend.pm
==============================================================================
--- bpsbuilder/Shipwright/lib/Shipwright/Backend.pm	(original)
+++ bpsbuilder/Shipwright/lib/Shipwright/Backend.pm	Thu Jan 24 05:01:29 2008
@@ -141,9 +141,14 @@
 use Config;
 use Getopt::Long;
 use Cwd;
+use CPAN;
+use CPAN::Config;
 
 my $build_base = getcwd;
 
+# we don't want any prereqs any more!
+$CPAN::Config->{prerequisites_policy} = 'ignore';
+
 my %args;
 GetOptions( \%args, 'install-base=s', 'perl=s', 'skip=s', 'skip-test',
     'only-test', 'force' );

Modified: bpsbuilder/Shipwright/lib/Shipwright/Build.pm
==============================================================================
--- bpsbuilder/Shipwright/lib/Shipwright/Build.pm	(original)
+++ bpsbuilder/Shipwright/lib/Shipwright/Build.pm	Thu Jan 24 05:01:29 2008
@@ -18,6 +18,12 @@
 use File::Find qw/find/;
 use File::Slurp;
 
+use CPAN;
+use CPAN::Config;
+
+# we don't want any prereqs any more!
+$CPAN::Config->{prerequisites_policy} = 'ignore';
+
 =head2 new
 
 =cut
@@ -38,7 +44,9 @@
       File::Spec->catfile( $self->install_base, 'lib' ) . ':'
       . $ENV{LD_LIBRARY_PATH};
     $ENV{PERL5LIB} =
-      File::Spec->catfile( $self->install_base, 'lib', 'perl5' ) . ':'
+        File::Spec->catfile( $self->install_base, 'lib', 'perl5', 'site_perl' )
+      . ':'
+      . File::Spec->catfile( $self->install_base, 'lib', 'perl5' ) . ':'
       . $ENV{PERL5LIB};
     $ENV{PATH} =
         File::Spec->catfile( $self->install_base, 'bin' ) . ':'