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

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Sun May 18 11:16:46 2008
New Revision: 12514

Modified:
   Shipwright/trunk/   (props changed)
   Shipwright/trunk/share/bin/shipwright-builder

Log:
 r12549 at sunnavys-mb:  sunnavy | 2008-05-18 20:16:31 +0800
 move require CPAN; to eval too


Modified: Shipwright/trunk/share/bin/shipwright-builder
==============================================================================
--- Shipwright/trunk/share/bin/shipwright-builder	(original)
+++ Shipwright/trunk/share/bin/shipwright-builder	Sun May 18 11:16:46 2008
@@ -119,16 +119,18 @@
     open my $tmp_fh, '>', '__need_clean' or die $!;
     close $tmp_fh;
 
-    require CPAN;
+    # some perl distribution( e.g. on fedora ) doesn't have CPAN module
+    # so we put it in eval block
+    eval {
+        require CPAN;
 
-    # don't bother people no CPAN::Config since it's not a problem
-    eval { require CPAN::Config };
+        # don't bother people no CPAN::Config since it's not a problem
+        require CPAN::Config;
 
-    # we don't want any prereqs any more!
-    {
+        # we don't want any prereqs any more!
         no warnings 'once';
         $CPAN::Config->{prerequisites_policy} = 'ignore';
-    }
+    };
 
     unless ( $args{name} ) {
         if ( $build_base =~ m{([-.\w]+)[\\/]([.\d]+)$} ) {