[Bps-public-commit] r15631 - in Shipwright/trunk: .

sunnavy at bestpractical.com sunnavy at bestpractical.com
Thu Aug 28 22:57:30 EDT 2008


Author: sunnavy
Date: Thu Aug 28 22:57:29 2008
New Revision: 15631

Modified:
   Shipwright/trunk/   (props changed)
   Shipwright/trunk/lib/Shipwright/Build.pm

Log:
 r16273 at sunnavys-mb:  sunnavy | 2008-08-29 10:21:34 +0800
 catcher up with shipwright-builder, run clean after each dist is installed


Modified: Shipwright/trunk/lib/Shipwright/Build.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Build.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Build.pm	Thu Aug 28 22:57:29 2008
@@ -256,7 +256,6 @@
                 $cmd  = $_;
             }
 
-            next if $type eq 'clean';        # don't need to clean when install
             if ( $self->skip_test && $type eq 'test' ) {
                 $self->log->info("skip build $type part in $dir");
                 next;
@@ -271,17 +270,20 @@
                         $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' ) {
+
+                    # clean is trivial, we'll just ignore if 'clean' fails
+                    die "build $dir $type part with failure.";
                 }
-                die "install failed";
             }
         }
     }



More information about the Bps-public-commit mailing list