Changeset 32356 for trunk/ippScripts/scripts/magic_destreak_revert.pl

Timestamp:

Sep 6, 2011, 2:02:54 PM (15 years ago)

Author:

bills

Message:

fix yet another logic error in magic_destreak_revert.pl

File:

• trunk/ippScripts/scripts/magic_destreak_revert.pl (modified) (2 diffs)

trunk/ippScripts/scripts/magic_destreak_revert.pl

@@ -9 +9 @@
 my $host = hostname();
 my $date = `date`;
-print "\n\n";
-print "Starting script $0 on $host at $date\n\n";
+print STDERR "\n\n";
+print STDERR "Starting script $0 on $host at $date\n\n";
 
 use vars qw( $VERSION );
@@ -413 +413 @@
     if ($backup_is_not_destreaked) {
         if ($original_is_not_destreaked) {
-            # this is unexpected result. throw an error so this can be checked manually
-            print STDERR "both files appear to not be destreaked\n";
+            print STDERR "\nBoth files appear to not be destreaked.\n";
             print STDERR "original: $original\n";
             print STDERR "backup:   $backup\n";
             my $o_basename = basename($o_path);
             my $b_basename = basename($b_path);
+            # if original file does not have SR_ in basename and the backup does then the 
+            # 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_/)) {
-                print " basenames are as expected it is safe to revert\n";
+                print STDERR " basenames are as expected it is safe to delete backup file\n";
+                if (! $ipprc->file_delete($backup, $force)) {
+                    print STDERR "failed to delete $backup\n";
+                    return 0;
+                }
+                return 1;
             } else {
+                # this is an unexpected result. throw an error so this can be checked manually
+                print STDERR " basenames for files are as NOT as expected unsafe to revert\n";
+                print STDERR " o_basename: $o_basename\n";
+                print STDERR " b_basename: $b_basename\n";
                 return 0;
             }