Changeset 36692

Timestamp:

Apr 22, 2014, 4:00:09 PM (12 years ago)

Author:

watersc1

Message:

Change to ensure WS diffs are cleaned up.

File:

• tags/ipp-20130712/ippScripts/scripts/nightly_science.pl (modified) (2 diffs, 1 prop)

tags/ipp-20130712/ippScripts/scripts/nightly_science.pl

@@ -1899 +1899 @@
             }
             my ($cleaning_date,$command) = construct_cleantool_args($date,$target,$mode);
+
             if ($cleaning_date eq 'no clean') {
                 next;
@@ -1913 +1914 @@
                 add_to_macro_list('clean_old',1,$date,$target,$mode);
             }
+            if ($mode eq 'DIFF') {
+                my $WS_command = $command;
+                $WS_command =~ s/$target/${target}.WS/;
+                print STDERR "$WS_command\n";
+                if (!(defined($pretend) || $debug == 1)) {
+                    
+                    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                        run ( command => $WS_command, verbose => $verbose );
+                    unless ($success) {
+                        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+                        &my_die("Unable to perform cleantool ($WS_command): $error_code", 0,0,$date, $PS_EXIT_SYS_ERROR);
+                    }
+                }
+            }
+
         }
     }