Changeset 11498 for trunk/PS-IPP-Config/lib/PS/IPP/Config.pm

Timestamp:

Jan 31, 2007, 2:52:42 PM (19 years ago)

Author:

eugene

Message:

fixed test for slow NSF

File:

• trunk/PS-IPP-Config/lib/PS/IPP/Config.pm (modified) (3 diffs)

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

@@ -1 +1 @@
 # Copyright (c) 2006  Paul Price, Joshua Hoblitt
 #
-# $Id: Config.pm,v 1.25 2007-01-31 23:41:36 eugene Exp $
+# $Id: Config.pm,v 1.26 2007-02-01 00:52:42 eugene Exp $
 
 package PS::IPP::Config;
@@ -100 +100 @@
 
     my @path = split /:/, $self->{path}; # List of paths to try
-    my $found;                  # Found it?
+    my $found = 0;                      # Found it?
+    my $realfile;
     foreach my $path (@path) {
-        my $test = File::Spec->rel2abs( $filename, $path );
-        if (-f $test) {
-            $found = $test;
+        $realfile = File::Spec->rel2abs( $filename, $path );
+        if (-f $realfile) {
+            $found = 1;
             last;
         }
     }
-    if (not defined $found) {
+    if (not $found) {
         ## try again after a moment?
         system ("df");
@@ -114 +115 @@
 
         ## try a second time
-        my $found;
         foreach my $path (@path) {
             print "trying: filename: $filename, path: $path -> ";
-            my $test = File::Spec->rel2abs( $filename, $path );
-            print "test: $test\n";
-            if (-f $test) {
-                $found = $test;
+            $realfile = File::Spec->rel2abs( $filename, $path );
+            print "test: $realfile\n";
+            if (-f $realfile) {
+                $found = 1;
                 last;
             }
         }
-        croak "Unable to find camera configuration file $filename\n" if not defined $found;
+        croak "Unable to find camera configuration file $filename\n" if not $found;
     }
 
     # Read the file
-    open my $file, $found or croak "Unable to open camera configuration file $found: $!";
+    open my $file, $realfile or croak "Unable to open camera configuration file $realfile: $!";
     my @contents = <$file>;
     close $file;