Changeset 21145

Timestamp:

Jan 21, 2009, 10:47:12 AM (17 years ago)

Author:

Paul Price

Message:

Ensure temporary files are deleted even on success. Not sure why this is necessary.

File:

• trunk/ippScripts/scripts/stack_skycell.pl (modified) (5 diffs)

trunk/ippScripts/scripts/stack_skycell.pl

@@ -241 +241 @@
         &my_die("Couldn't find expected output file: $outputStats", $stack_id, $PS_EXIT_SYS_ERROR) unless -f $outputStatsReal;
 
-        # measure chip stats
+        # measure stats
         $command = "$ppStatsFromMetadata $outputStatsReal - STACK_SKYCELL";
         ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -255 +255 @@
     }
 }
+
+delete_temps() unless ($save_temps);
 
 unless ($no_update) {
@@ -285 +287 @@
 
 
+
 sub my_die
 {
@@ -293 +296 @@
     carp($msg);
 
-    unless ($save_temps) {
-        print "Ensuring temporary images are deleted.\n";
-        delete_temps();
-    }
+    delete_temps() unless ($save_temps);
 
     if (defined $stack_id and not $no_update) {
@@ -317 +317 @@
 sub delete_temps
 {
+    print "Ensuring temporary images are deleted.\n";
     my $command = "$ppConfigDump -camera $camera -recipe PPSTACK $recipe_ppStack -dump-recipe PPSTACK -";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
+        run(command => $command, verbose => $verbose);
     unless ($success) {
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die("Unable to perform ppConfigDump: $error_code", $stack_id, $error_code);
+        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+        &my_die("Unable to perform ppConfigDump: $error_code", $stack_id, $error_code);
     }
     my $md = $mdcParser->parse(join "", @$stdout_buf) or
-        &my_die("Unable to parse metadata config doc", $stack_id, $PS_EXIT_PROG_ERROR);
+        &my_die("Unable to parse metadata config doc", $stack_id, $PS_EXIT_PROG_ERROR);
 
     my $temp_delete = metadataLookupBool($md, 'TEMP.DELETE'); # Delete temporary files?
     if ($temp_delete) {
-        my $temp_dir = metadataLookupStr($md, 'TEMP.DIR'); # Directory with temporary files
-        my $temp_image = metadataLookupStr($md, 'TEMP.IMAGE'); # Suffix for image
-        my $temp_mask = metadataLookupStr($md, 'TEMP.MASK'); # Suffix for mask
-        my $temp_weight = metadataLookupStr($md, 'TEMP.WEIGHT'); # Suffix for weight
-        my $temp_root = basename($outroot); # Root name for temporary files
-
-        if (not defined $temp_dir or not defined $temp_image or not defined $temp_mask or 
-            not defined $temp_weight) {
-            &my_die("Unable to find details for temporary images.", $stack_id, $PS_EXIT_CONFIG_ERROR);
-        }
-
-        for (my $i = 0; $i < $num; $i++) {
-            foreach my $ext ( $temp_image, $temp_mask, $temp_weight ) {
-                my $file = $temp_dir . '/' . $temp_root . '.' . $i . '.' . $ext;
-                unlink $file if -e $file;
-            }
-        }
+        my $temp_dir = metadataLookupStr($md, 'TEMP.DIR'); # Directory with temporary files
+        my $temp_image = metadataLookupStr($md, 'TEMP.IMAGE'); # Suffix for image
+        my $temp_mask = metadataLookupStr($md, 'TEMP.MASK'); # Suffix for mask
+        my $temp_weight = metadataLookupStr($md, 'TEMP.WEIGHT'); # Suffix for weight
+        my $temp_root = basename($outroot); # Root name for temporary files
+
+        if (not defined $temp_dir or not defined $temp_image or not defined $temp_mask or
+            not defined $temp_weight) {
+            &my_die("Unable to find details for temporary images.", $stack_id, $PS_EXIT_CONFIG_ERROR);
+        }
+
+        for (my $i = 0; $i < $num; $i++) {
+            foreach my $ext ( $temp_image, $temp_mask, $temp_weight ) {
+                my $file = $temp_dir . '/' . $temp_root . '.' . $i . '.' . $ext;
+                unlink $file if -e $file;
+            }
+        }
     }
 }