Changeset 27092

Timestamp:

Feb 25, 2010, 2:26:12 PM (16 years ago)

Author:

bills

Message:

Add force argument to $ipprc->file_delete() use it in magic_destreak_revert.pl

Location:

trunk

Files:

• PS-IPP-Config/lib/PS/IPP/Config.pm (modified) (1 diff)
• ippScripts/scripts/magic_destreak_revert.pl (modified) (4 diffs)

trunk/PS-IPP-Config/lib/PS/IPP/Config.pm

@@ -655 +655 @@
     my $self = shift;                # Configuration object
     my $name = shift;                # File name to check
+    my $force = shift;               # pass force flag to the delete method
     my $status;
 
     my $scheme = file_scheme($name); # The scheme, e.g., file://, path://
     if (defined $scheme and lc($scheme) eq 'neb') {
-        $status = eval { $self->nebulous->delete( $name ); };
+        $status = eval { $self->nebulous->delete( $name, $force ); };
         ( carp "Unable to delete Nebulous handle $name" and return undef ) if $@;
     } else {

trunk/ippScripts/scripts/magic_destreak_revert.pl

@@ -253 +253 @@
     if ($mask) {
         if (!revert_file($mask, $bmask)) {
-            if ($stage eq 'chip') {
-                # don't fail if the mask file (from the camera stage) fails to revert.
-                # It probably doesn't exist
-                # XXX: Handle this properly
-                print STDERR "failure to revert mask file, ignored\n";
-            } else {
-                &my_die("failed to restore mask file", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR);
-            }
+            &my_die("failed to restore mask file", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR);
         }
     }
@@ -306 +299 @@
     my $original = shift;
     my $backup   = shift;
+    my $force = 1; # force deletion of backup files in nebulous
 
     my $o_path = $ipprc->file_resolve($original);
@@ -352 +346 @@
         }
 
-        if ($b_path and -e $b_path) {
+        if ($b_path) {
             print "ready to delete backup\n" if $verbose;
-            if (! $ipprc->file_delete($backup)) {
+            if (! $ipprc->file_delete($backup, $force)) {
                 print "failed to delete $backup\n";
                 return 0;
@@ -363 +357 @@
         print "original uri: $original is not a destreaked file no need to swap backup_result: $backup_result\n";
         # delete the 'backup' (destreaked target) file if it exists
-        if ($b_path and -e $b_path) {
-            if (! $ipprc->file_delete($backup)) {
+        if ($b_path) {
+            if (! $ipprc->file_delete($backup, $force)) {
                 print "failed to delete $backup\n";
                 return 0;