Changeset 28901

Timestamp:

Aug 11, 2010, 12:25:43 PM (16 years ago)

Author:

bills

Message:

From Trunk. When updating a chipRun make sure any lingering destreak backup files.
We have a number of older runs that didn't get cleaned properly. This works around
that problem.

Location:

tags/ipp-20100701

Files:

• PS-IPP-Config/lib/PS/IPP/Config.pm (modified) (1 diff, 1 prop)
• ippScripts/scripts/chip_imfile.pl (modified) (3 diffs, 1 prop)

tags/ipp-20100701/PS-IPP-Config/lib/PS/IPP/Config.pm

@@ -673 +673 @@
 }
 
+# delete existing destreak backup file if it exists
+sub delete_destreak_backup_file
+{
+    my $self = shift;
+    my $name = shift;
+    my $force = shift;
+
+    my $dir = dirname($name);
+    my $base = basename($name);
+    my $backup =  "$dir/SR_$base";
+
+    if ($self->file_exists($backup)) {
+        return $self->file_delete($backup, $force);
+    }
+    return 1;
+}
+
 # redirect stderr and stdout streams to a file
 sub redirect_output

tags/ipp-20100701/ippScripts/scripts/chip_imfile.pl

@@ -23 +23 @@
 use PS::IPP::Config 1.01 qw( :standard );
 use File::Temp qw( tempfile );
+use File::Basename;
 
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
@@ -125 +126 @@
     $outputStats .= '.update';
     $traceDest .= '.update';
+    # make sure that any lingering destreak backup files are gone
+    $ipprc->delete_destreak_backup_file($outputImage)
+        or &my_die("failed to delete existing destreak backup image file", $exp_id, $chip_id, $class_id, $PS_EXIT_UNKNOWN_ERROR);
+    $ipprc->delete_destreak_backup_file($outputMask)
+        or &my_die("failed to delete existing destreak backup mask file", $exp_id, $chip_id, $class_id, $PS_EXIT_UNKNOWN_ERROR);
+    $ipprc->delete_destreak_backup_file($outputWeight)
+        or &my_die("failed to delete existing destreak backup weight file", $exp_id, $chip_id, $class_id, $PS_EXIT_UNKNOWN_ERROR);
 }
 
@@ -454 +462 @@
 }
 
+
 sub my_die
 {