Changeset 33638 for branches/eam_branches/ipp-20111122/ippScripts/scripts/magic_destreak_revert.pl

Timestamp:

Mar 30, 2012, 2:49:37 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20111122/ippScripts/scripts/magic_destreak_revert.pl (modified) (3 diffs)

branches/eam_branches/ipp-20111122/ippScripts/scripts/magic_destreak_revert.pl

@@ -86 +86 @@
 my $ipprc = PS::IPP::Config->new( $camera ) or my_die( "Unable to set up", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR ); # IPP configuration
 
-$ipprc->redirect_output($logfile) or my_die( "Unable to redirect output", $magic_ds_id, $component, $PS_EXIT_SYS_ERROR ) if $logfile;
+$ipprc->redirect_to_logfile($logfile) or my_die( "Unable to redirect output", $magic_ds_id, $component, $PS_EXIT_SYS_ERROR ) if $logfile;
 
 &my_die("bytes and md5sum are is required for raw stage stage", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR) if ($replace and $stage eq 'raw' and (!$bytes or !$md5sum));
@@ -421 +421 @@
             # files are in their original state. Just delete back up file
             # otherwise go to failed_revert for manual inspection.
-            if (!($o_basename =~ /SR_/) and ($b_basename =~ /SR_/)) {
+            # XXX: We probably can get by with just checking the basename of the original file
+            if (!($o_basename =~ /SR_/) ) {
+            # if (!($o_basename =~ /SR_/) and ($b_basename =~ /SR_/)) {
                 print STDERR " basenames are as expected it is safe to delete backup file\n";
                 if (! $ipprc->file_delete($backup, $force)) {
@@ -481 +483 @@
     foreach my $file (@_) {
         next if !$file;
-        if ($ipprc->file_exists($file)) {
-            if (!$ipprc->file_delete($file)) {
-                &my_die("failed to delete recovery file $file", $magic_ds_id, $component, $PS_EXIT_UNKNOWN_ERROR);
-            }
-        }
+        # don't care if this fails or not (it will fail if storage
+        # object doesn't exist
+        $ipprc->kill_file($file);
     }
 }