Changeset 16551

Timestamp:

Feb 19, 2008, 3:55:58 PM (18 years ago)

Author:

eugene

Message:

clarified error message

File:

• branches/eam_branch_20080219/PS-IPP-Config/lib/PS/IPP/Config.pm (modified) (6 diffs)

branches/eam_branch_20080219/PS-IPP-Config/lib/PS/IPP/Config.pm

@@ -1 +1 @@
 # Copyright (c) 2006  Paul Price, Joshua Hoblitt
 #
-# $Id: Config.pm,v 1.75.2.1 2008-02-19 20:09:09 eugene Exp $
+# $Id: Config.pm,v 1.75.2.2 2008-02-20 01:55:58 eugene Exp $
 
 package PS::IPP::Config;
@@ -96 +96 @@
     bless $self, $class;
 
-    print "load site\n";
     $self->load_site();
-
-    print "load system\n";
     $self->load_system();
 
@@ -154 +151 @@
 
     my $i = 0;
-    print "$i"; $i ++;
 
     unless (defined $self) {
@@ -160 +156 @@
         exit($PS_EXIT_PROG_ERROR);
     }
-    print "$i"; $i ++;
 
     my $filename = metadataLookupStr($self->{_userConfig}, 'SITE'); # Site config file
@@ -167 +162 @@
         exit($PS_EXIT_CONFIG_ERROR);
     }
-    print "$i"; $i ++;
 
     my $realfile = $self->_find_config($filename); # Resolved filename, after hunting the PATH
-    print "$i"; $i ++;
 
     # Read the file
@@ -178 +171 @@
         exit($PS_EXIT_CONFIG_ERROR);
     }
-    print "$i"; $i ++;
 
     my @contents = <$file>;
     close $file;
     $self->{_siteConfig} = $parser->parse( join '', @contents); # The parsed metadata config
-    print "$i"; $i ++;
-
-    ## XXXX : the error is here
+
     unless (defined $self->{_siteConfig}) {
-        carp "Failure to define site configuration";
-        exit($PS_EXIT_CONFIG_ERROR);
-    }
-    print "$i"; $i ++;
-
-    # XXX why isn't just $self being returned here? -JH
+        carp "Failure to parse the site configuration file $realfile";
+        exit($PS_EXIT_CONFIG_ERROR);
+    }
+
     return $self;
 }