Changeset 25766 for branches/eam_branches/20090820/ippScripts/scripts/magic_destreak_revert.pl

Timestamp:

Oct 2, 2009, 5:10:19 PM (17 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/20090820

Files:

• . (modified) (1 prop)
• ippScripts/scripts/magic_destreak_revert.pl (modified) (3 diffs, 1 prop)

branches/eam_branches/20090820/ippScripts/scripts/magic_destreak_revert.pl

@@ -191 +191 @@
 }
 
-revert_files($image, $mask, $weight, $sources, $astrom, $bimage, $bmask, $bweight, $bsources, $bastrom);
-
-if ($stage eq "diff") {
+revert_files($replace, $image, $mask, $weight, $sources, $astrom, $bimage, $bmask, $bweight, $bsources, $bastrom);
+
+if ($stage eq "diff" and $inverse) {
     my $name = "PPSUB.INVERSE";
     $image  = $ipprc->filename($name, $path_base);
@@ -203 +203 @@
     $bweight = $ipprc->filename("$name.VARIANCE", $backup_path_base);
     $bsources = $ipprc->filename("$name.SOURCES", $backup_path_base);
-    revert_files($image, $mask, $weight, $sources, undef, $bimage, $bmask, $bweight, $bsources, undef);
+    revert_files($replace, $image, $mask, $weight, $sources, undef, $bimage, $bmask, $bweight, $bsources, undef);
 }
 
 # now revert the row in the database
 {
-    my $command = "$magicdstool -revertdestreakedfile";
+    my $command = "$magicdstool -revertdestreakedfile -i_am_sure";
     $command   .= " -magic_ds_id $magic_ds_id";
     $command   .= " -component $component";
@@ -231 +231 @@
 
 sub revert_files {
+    my $replace = shift;
+    return if !$replace;
+
     my $image = shift;
     my $mask = shift;