[Bps-public-commit] r15670 - in Shipwright/branches/1.10: lib/Shipwright share/bin

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Sat Aug 30 02:20:31 2008
New Revision: 15670

Modified:
   Shipwright/branches/1.10/lib/Shipwright/Build.pm
   Shipwright/branches/1.10/share/bin/shipwright-builder
   Shipwright/branches/1.10/t/hello/svk.t
   Shipwright/branches/1.10/t/hello/svn.t

Log:
merged 15668:15668 to 1.1

Modified: Shipwright/branches/1.10/lib/Shipwright/Build.pm
==============================================================================
--- Shipwright/branches/1.10/lib/Shipwright/Build.pm	(original)
+++ Shipwright/branches/1.10/lib/Shipwright/Build.pm	Sat Aug 30 02:20:31 2008
@@ -253,16 +253,18 @@
                         $self->log->error(
 "although tests failed, will install anyway since we have force arg\n"
                         );
+                        next;
                     }
                     ## no critic
                     elsif ( eval "$ktf->{$dir}" ) {
                         $self->log->error(
 "although tests failed, will install anyway since it's a known failure\n"
                         );
+                        next;
                     }
-                    next;
                 }
-                elsif ( $type ne 'clean' ) {
+
+                if ( $type ne 'clean' ) {
 
                     # clean is trivial, we'll just ignore if 'clean' fails
                     confess "build $dir $type part with failure.";

Modified: Shipwright/branches/1.10/share/bin/shipwright-builder
==============================================================================
--- Shipwright/branches/1.10/share/bin/shipwright-builder	(original)
+++ Shipwright/branches/1.10/share/bin/shipwright-builder	Sat Aug 30 02:20:31 2008
@@ -343,15 +343,17 @@
                     if ( $args{force} ) {
                         print $log
 "although tests failed, will install anyway since we have force arg\n";
+                        next;
                     }
                     ## no critic
                     elsif ( eval "$ktf->{$dir}" ) {
                         print $log
 "although tests failed, will install anyway since it's a known failure\n";
+                        next;
                     }
-                    next;
                 }
-                elsif ( $type ne 'clean' ) {
+
+                if ( $type ne 'clean' ) {
 
                     # clean is trivial, we'll just ignore if 'clean' fails
                     confess "build $dir $type part with failure.\n";

Modified: Shipwright/branches/1.10/t/hello/svk.t
==============================================================================
--- Shipwright/branches/1.10/t/hello/svk.t	(original)
+++ Shipwright/branches/1.10/t/hello/svk.t	Sat Aug 30 02:20:31 2008
@@ -48,6 +48,7 @@
         source => 'file:' . catfile( 't', 'hello', 'Acme-Hello-0.03.tar.gz' ),
         follow => 0,
         log_level => 'FATAL',
+        force => 1,
     );
 
     isa_ok( $shipwright,          'Shipwright' );
@@ -139,6 +140,7 @@
         name   => 'howdy',
         follow => 0,
         log_level => 'FATAL',
+        force => 1,
     );
 
     $source_dir = $shipwright->source->run();

Modified: Shipwright/branches/1.10/t/hello/svn.t
==============================================================================
--- Shipwright/branches/1.10/t/hello/svn.t	(original)
+++ Shipwright/branches/1.10/t/hello/svn.t	Sat Aug 30 02:20:31 2008
@@ -24,6 +24,7 @@
         source => 'file:' . catfile( 't', 'hello', 'Acme-Hello-0.03.tar.gz' ),
         log_level => 'FATAL',
         follow    => 0,
+        force => 1,
     );
 
     isa_ok( $shipwright->backend, 'Shipwright::Backend::SVN' );