Changeset 27517 for branches/eam_branches/20100225/PS-IPP-Config/lib/PS/IPP/Config.pm

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• PS-IPP-Config/lib/PS/IPP/Config.pm (modified) (2 diffs)

branches/eam_branches/20100225/PS-IPP-Config/lib/PS/IPP/Config.pm

@@ -590 +590 @@
     my $scheme = file_scheme($name); # The scheme, e.g., file://, path://
     if (defined $scheme and lc($scheme) eq 'neb') {
-        my $found = eval { $self->nebulous->find_instances( $name ); };
-        ( carp "Unable to find instances of Nebulous handle $name" and return undef ) if $@;
-        return (defined $found ? 1 : 0);
-    }
-
-    return (-f $self->file_resolve($name));
+        my $found = eval { $self->nebulous->find( $name ); };
+        ( carp "Unable to find instance of Nebulous handle $name" and return undef ) if $@;
+        return 0 unless defined $found;
+        return (-f $found and -s $found);
+    }
+
+    return (-f $self->file_resolve($name) and -s $self->file_resolve($name));
 }
 
@@ -655 +656 @@
     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 {