Changeset 16407 for gsdl/trunk/perllib/g2futil.pm

Timestamp:

2008-07-15T13:13:16+12:00 (16 years ago)

Author:

ak19

Message:

Corrected change made yesterday: dealing with the undefined case (as happens for GS2) when temporarily switching CATAlINA_HOME to fedora's tomcat which is necessary for GS3

File:

• gsdl/trunk/perllib/g2futil.pm (modified) (2 diffs)

gsdl/trunk/perllib/g2futil.pm

@@ -288 +288 @@
     # CATALINA_HOME is set to GS' own tomcat. Since we'll be working with fedora, we need
     # to temporarily set CATALINA_HOME to fedora's tomcat. (Catalina is undefined for GS2).
-    my $gs_catalina_home = $ENV{'CATALINA_HOME'};
-    if(defined $gs_catalina_home) {
-    $ENV{'CATALINA_HOME'} = &util::filename_cat($ENV{'FEDORA_HOME'}, "tomcat");
-    }
-
+    my $gs_catalina_home = $ENV{'CATALINA_HOME'} if defined $ENV{'CATALINA_HOME'};
+    $ENV{'CATALINA_HOME'} = &util::filename_cat($ENV{'FEDORA_HOME'}, "tomcat");
+    
     # 1. Find out which folder to write to: fedora_host or localhost 
     # whichever contains fedora.xml is the one we want (if none, exit with error value?)
@@ -374 +372 @@
 
     # reset CATALINA_HOME to GS' Tomcat (it is undefined for GS2 since GS2 has no tomcat):
-    if(defined $gs_catalina_home) {
-    $ENV{'CATALINA_HOME'} = $gs_catalina_home;
-    }
-
+    $ENV{'CATALINA_HOME'} = $gs_catalina_home if defined $gs_catalina_home;
+    
     # Starting up the Fedora server takes a long time. We need to wait for the server to be
     # ready before import can continue, because g2f-import relies on an up-and-running Fedora