Changeset 11835

Timestamp:

Feb 15, 2007, 12:35:38 PM (19 years ago)

Author:

Paul Price

Message:

Fixing some compilation errors. Fixing exit when environment variable not set.

File:

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

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

@@ -1 +1 @@
 # Copyright (c) 2006  Paul Price, Joshua Hoblitt
 #
-# $Id: Config.pm,v 1.29 2007-02-09 03:55:22 price Exp $
+# $Id: Config.pm,v 1.30 2007-02-15 22:35:38 price Exp $
 
 package PS::IPP::Config;
@@ -60 +60 @@
     $name = $ENV{HOME} . '/.ipprc' unless defined $name;
 
-    open my $file, $name;
+    my $file;                   # File handle
+    open $file, $name;
     unless ($file) {
         carp "Unable to open ipprc file $name: $!";
@@ -140 +141 @@
 
     # Read the file
-    open my $file, $realfile;
+    my $file;                   # File handle
+    open $file, $realfile;
     unless ($file) {
         carp "Unable to open camera configuration file $realfile: $!";
@@ -388 +390 @@
         my $name = $1;          # Environment variable name
         my $value = $ENV{$name}; # Environment variable value
-#       print "Replacing $name with $value.\n";
+        unless (defined $value) {
+            carp "Unable to find environment variable $name";
+            exit($PS_EXIT_SYS_ERROR);
+        }
         $dir =~ s/\$\{?$name\}?/$value\//;
     }