Changeset 26721 for branches/eam_branches/20091201/ippScripts/scripts/magic_destreak_cleanup.pl

Timestamp:

Jan 29, 2010, 10:51:08 AM (16 years ago)

Author:

eugene

Message:

various cleanup and automation operations

File:

• branches/eam_branches/20091201/ippScripts/scripts/magic_destreak_cleanup.pl (modified) (4 diffs)

branches/eam_branches/20091201/ippScripts/scripts/magic_destreak_cleanup.pl

@@ -183 +183 @@
         }
 
-        delete_files($rimage, $rmask, $rweight, $rsources, $rastrom, $bimage, $bmask, $bweight, $bsources, $bastrom);
+        delete_files($rimage, $rmask, $rweight, $rsources, $rastrom, $bimage, $bmask, $bweight, $bsources, $bastrom, $bch_mask, $rch_mask);
 
         if ($stage eq "diff" and $inverse) {
@@ -199 +199 @@
                 $rsources = $ipprc->filename("$name.SOURCES", $recovery_path_base);
             }
-            delete_files($rimage, $rmask, $rweight, $rsources, undef, $bimage, $bmask, $bweight, $bsources, undef);
+            # undef is not necessary, it's just to keep the lists in the same order.
+            delete_files($rimage, $rmask, $rweight, $rsources, undef, $bimage, $bmask, $bweight, $bsources);
         }
 }
@@ -211 +212 @@
 if (!$no_update) {
     my $result = $dbh->do("UPDATE magicDSRun SET state = 'cleaned' WHERE magic_ds_id = ?", undef, $magic_ds_id);
-    my_die("attempt to update magicDSRun failed", $magic_ds_id, $PS_EXIT_UNKNOWN_ERROR) if $result eq "0E0";
+    my_die("attempt to update magicDSRun.state failed", $magic_ds_id, $PS_EXIT_UNKNOWN_ERROR) if $result eq "0E0";
 } else {
     print STDERR "skipping update of magicDSRun\n";
@@ -246 +247 @@
     $exit_code = $PS_EXIT_PROG_ERROR unless defined $exit_code;
 
-    my $command = "$magicdstool -updaterun -fault $exit_code";
+    my $command = "$magicdstool -updaterun -set_state failed_cleanup";
     $command   .= " -magic_ds_id $magic_ds_id";
     $command   .= " -dbname $dbname" if defined $dbname;