Changeset 28901
- Timestamp:
- Aug 11, 2010, 12:25:43 PM (16 years ago)
- Location:
- tags/ipp-20100701
- Files:
-
- 2 edited
-
PS-IPP-Config/lib/PS/IPP/Config.pm (modified) (1 diff, 1 prop)
-
ippScripts/scripts/chip_imfile.pl (modified) (3 diffs, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
tags/ipp-20100701/PS-IPP-Config/lib/PS/IPP/Config.pm
- Property svn:mergeinfo set to
r28153 r28901 673 673 } 674 674 675 # delete existing destreak backup file if it exists 676 sub delete_destreak_backup_file 677 { 678 my $self = shift; 679 my $name = shift; 680 my $force = shift; 681 682 my $dir = dirname($name); 683 my $base = basename($name); 684 my $backup = "$dir/SR_$base"; 685 686 if ($self->file_exists($backup)) { 687 return $self->file_delete($backup, $force); 688 } 689 return 1; 690 } 691 675 692 # redirect stderr and stdout streams to a file 676 693 sub redirect_output -
tags/ipp-20100701/ippScripts/scripts/chip_imfile.pl
- Property svn:mergeinfo set to
r28014 r28901 23 23 use PS::IPP::Config 1.01 qw( :standard ); 24 24 use File::Temp qw( tempfile ); 25 use File::Basename; 25 26 26 27 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt ); … … 125 126 $outputStats .= '.update'; 126 127 $traceDest .= '.update'; 128 # make sure that any lingering destreak backup files are gone 129 $ipprc->delete_destreak_backup_file($outputImage) 130 or &my_die("failed to delete existing destreak backup image file", $exp_id, $chip_id, $class_id, $PS_EXIT_UNKNOWN_ERROR); 131 $ipprc->delete_destreak_backup_file($outputMask) 132 or &my_die("failed to delete existing destreak backup mask file", $exp_id, $chip_id, $class_id, $PS_EXIT_UNKNOWN_ERROR); 133 $ipprc->delete_destreak_backup_file($outputWeight) 134 or &my_die("failed to delete existing destreak backup weight file", $exp_id, $chip_id, $class_id, $PS_EXIT_UNKNOWN_ERROR); 127 135 } 128 136 … … 454 462 } 455 463 464 456 465 sub my_die 457 466 {
Note:
See TracChangeset
for help on using the changeset viewer.
