Changeset 16969

Timestamp:

2008-08-22T15:09:33+12:00 (16 years ago)

Author:

kjdon

Message:

check that GSDLCOLLECTDIR is defined before using it in locate_config_files. Sometimes (eg when exploding) we are not in the context of a collection

File:

• gsdl/trunk/perllib/util.pm (modified) (1 diff)

gsdl/trunk/perllib/util.pm

@@ -906 +906 @@
     else {
     # Check for collection specific one before looking in global GSDL 'etc'
-
-    my $test_collect_etc_filename 
-        = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"etc", $file);
-
-    if (-e $test_collect_etc_filename) {
-        push(@locations,$test_collect_etc_filename);
-    }
-
+    if (defined $ENV{'GSDLCOLLECTDIR'} && $ENV{'GSDLCOLLECTDIR'} ne "") {
+        my $test_collect_etc_filename 
+        = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"etc", $file);
+        
+        if (-e $test_collect_etc_filename) {
+        push(@locations,$test_collect_etc_filename);
+        }
+    }
     my $test_main_etc_filename 
         = &util::filename_cat($ENV{'GSDLHOME'},"etc", $file);