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

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Sat Aug 30 02:18:37 2008
New Revision: 15668

Modified:
   Shipwright/trunk/   (props changed)
   Shipwright/trunk/lib/Shipwright/Build.pm
   Shipwright/trunk/share/bin/shipwright-builder

Log:
 r16340 at sunnavys-mb:  sunnavy | 2008-08-30 14:04:31 +0800
 fixed a logic bug when build


Modified: Shipwright/trunk/lib/Shipwright/Build.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Build.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Build.pm	Sat Aug 30 02:18:37 2008
@@ -270,16 +270,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/trunk/share/bin/shipwright-builder
==============================================================================
--- Shipwright/trunk/share/bin/shipwright-builder	(original)
+++ Shipwright/trunk/share/bin/shipwright-builder	Sat Aug 30 02:18:37 2008
@@ -355,15 +355,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";