Changeset 26976

Timestamp:

Feb 17, 2010, 1:13:07 PM (16 years ago)

Author:

bills

Message:

if both backup and original files appear to be non-destreaked files fault.
This case should be examined by hand until we understand the problem

File:

• trunk/ippScripts/scripts/magic_destreak_revert.pl (modified) (1 diff)

trunk/ippScripts/scripts/magic_destreak_revert.pl

@@ -330 +330 @@
 
     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 "original: $original\n";
+            print STDERR "backup:   $backup\n";
+            return 0;
+        }
         # XXX TODO if stage is raw, check that backup has the correct size and md5sum
 
+        if ($verbose) {
+            print "ready to swap $backup\n";
+            print "           to $original\n";
+        }
         # Do we need to make this test? After the swap we're going to delete the file anyways
-        print "ready to swap $backup to $original\n" if $verbose;
 
         if (! $nebulous->swap($backup, $original)) {
-            print "failed to swap $backup to $original\n";
+            print "failed to swap $backup\n";
+            print "            to $original\n";
             return 0;
         }