[Bps-public-commit] r13720 - in Shipwright/trunk: . lib/Shipwright/Backend lib/Shipwright/Source share/bin share/shipwright

sunnavy at bestpractical.com sunnavy at bestpractical.com
Tue Jul 1 14:17:14 EDT 2008


Author: sunnavy
Date: Tue Jul  1 14:17:13 2008
New Revision: 13720

Added:
   Shipwright/trunk/share/shipwright/known_test_failures.yml
      - copied unchanged from r13604, /Shipwright/trunk/share/shipwright/ktf.yml
Removed:
   Shipwright/trunk/share/shipwright/ktf.yml
Modified:
   Shipwright/trunk/   (props changed)
   Shipwright/trunk/lib/Shipwright/Backend/Base.pm
   Shipwright/trunk/lib/Shipwright/Build.pm
   Shipwright/trunk/lib/Shipwright/Source/CPAN.pm
   Shipwright/trunk/share/bin/shipwright-builder

Log:
 r13991 at sunnavys-mb:  sunnavy | 2008-07-01 23:54:36 +0800
 rename ktf.yml to known_test_failures.yml


Modified: Shipwright/trunk/lib/Shipwright/Backend/Base.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Backend/Base.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Backend/Base.pm	Tue Jul  1 14:17:13 2008
@@ -350,7 +350,7 @@
 sub ktf {
     my $self = shift;
     my $ktf  = shift;
-    my $path = '/shipwright/ktf.yml';
+    my $path = '/shipwright/known_test_failures.yml';
 
     return $self->_yml( $path, $ktf );
 }

Modified: Shipwright/trunk/lib/Shipwright/Build.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Build.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Build.pm	Tue Jul  1 14:17:13 2008
@@ -135,10 +135,10 @@
             $flags = {};
         }
 
-        if ( -e File::Spec->catfile( 'shipwright', 'ktf.yml' ) ) {
+        if ( -e File::Spec->catfile( 'shipwright', 'known_test_failures.yml' ) ) {
 
             $ktf = Shipwright::Util::LoadFile(
-                File::Spec->catfile( 'shipwright', 'ktf.yml' ) );
+                File::Spec->catfile( 'shipwright', 'known_test_failures.yml' ) );
         }
         else {
             $ktf = {};

Modified: Shipwright/trunk/lib/Shipwright/Source/CPAN.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Source/CPAN.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Source/CPAN.pm	Tue Jul  1 14:17:13 2008
@@ -32,26 +32,26 @@
     my $class = shift;
     my $self  = $class->SUPER::new(@_);
 
-    CPAN::Config->use;
-
-    mkdir File::Spec->catfile( $cpan_dir, 'CPAN' );
-    my $config_file = File::Spec->catfile( $cpan_dir, 'CPAN', 'MyConfig.pm' );
-
-    unless ( -f $config_file ) {
-        $CPAN::Config->{cpan_home} = File::Spec->catfile($cpan_dir);
-        $CPAN::Config->{build_dir} = File::Spec->catfile( $cpan_dir, 'build' );
-        $CPAN::Config->{histfile} =
-          File::Spec->catfile( $cpan_dir, 'histfile' );
-        $CPAN::Config->{keep_source_where} =
-          File::Spec->catfile( $cpan_dir, 'sources' );
-        $CPAN::Config->{prefs_dir} = File::Spec->catfile( $cpan_dir, 'prefs' );
-        $CPAN::Config->{prerequisites_policy} = 'follow';
-        $CPAN::Config->{urllist}              = [];
-        write_file( $config_file,
-            Data::Dumper->Dump( [$CPAN::Config], ['$CPAN::Config'] ) );
-
-    }
-    require CPAN::MyConfig;
+#    CPAN::Config->use;
+#
+#    mkdir File::Spec->catfile( $cpan_dir, 'CPAN' );
+#    my $config_file = File::Spec->catfile( $cpan_dir, 'CPAN', 'MyConfig.pm' );
+#
+#    unless ( -f $config_file ) {
+#        $CPAN::Config->{cpan_home} = File::Spec->catfile($cpan_dir);
+#        $CPAN::Config->{build_dir} = File::Spec->catfile( $cpan_dir, 'build' );
+#        $CPAN::Config->{histfile} =
+#          File::Spec->catfile( $cpan_dir, 'histfile' );
+#        $CPAN::Config->{keep_source_where} =
+#          File::Spec->catfile( $cpan_dir, 'sources' );
+#        $CPAN::Config->{prefs_dir} = File::Spec->catfile( $cpan_dir, 'prefs' );
+#        $CPAN::Config->{prerequisites_policy} = 'follow';
+#        $CPAN::Config->{urllist}              = [];
+#        write_file( $config_file,
+#            Data::Dumper->Dump( [$CPAN::Config], ['$CPAN::Config'] ) );
+#
+#    }
+#    require CPAN::MyConfig;
     return $self;
 }
 

Modified: Shipwright/trunk/share/bin/shipwright-builder
==============================================================================
--- Shipwright/trunk/share/bin/shipwright-builder	(original)
+++ Shipwright/trunk/share/bin/shipwright-builder	Tue Jul  1 14:17:13 2008
@@ -113,9 +113,13 @@
     $flags = {};
 }
 
-if ( -e File::Spec->catfile( 'shipwright', 'ktf.yml' ) ) {
+if ( -e File::Spec->catfile( 'shipwright', 'known_test_failures.yml' ) ) {
     $ktf =
-      ( YAML::Tiny->read( File::Spec->catfile( 'shipwright', 'ktf.yml' ) ) )->[0];
+    (
+        YAML::Tiny->read(
+            File::Spec->catfile( 'shipwright', 'known_test_failures.yml' )
+        )
+    )->[0];
 }
 else {
     $ktf = {};



More information about the Bps-public-commit mailing list