Changeset 32911

Timestamp:

Dec 9, 2011, 9:45:42 AM (15 years ago)

Author:

bills

Message:

When reverting be less paranoid. If the resolved basename of the original file
doesn't have SR_ go ahead and delete the backup regardless of whether it's basename
contains SR_ or not.
use $ipprc->redirect_to_logfile() to avoid dead instances

File:

• tags/ipp-20111110/ippScripts/scripts/magic_destreak_revert.pl (modified) (2 diffs)

tags/ipp-20111110/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)) {