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

Timestamp:

2008-07-14T19:41:21+12:00 (16 years ago)

Author:

ak19

Message:

Need to take into account that catalina_home is undefined for gs2, before doing the swap with Fedora's catalina_home

File:

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

gsdl/trunk/perllib/g2futil.pm

@@ -292 +292 @@
     # The top of this file has already made sure that FEDORA_HOME is set, but for GS3
     # 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:
+    # to temporarily set CATALINA_HOME to fedora's tomcat. (Catalina is undefined for GS2).
     my $gs_catalina_home = $ENV{'CATALINA_HOME'};
-    $ENV{'CATALINA_HOME'} = &util::filename_cat($ENV{'FEDORA_HOME'}, "tomcat");
+    if(defined $gs_catalina_home) {
+    $ENV{'CATALINA_HOME'} = &util::filename_cat($ENV{'FEDORA_HOME'}, "tomcat");
+    }
 
     # 1. Find out which folder to write to: fedora_host or localhost 
@@ -376 +378 @@
     }
 
-    # reset CATALINA_HOME to GS' Tomcat:
-    $ENV{'CATALINA_HOME'} = $gs_catalina_home;
-    
+    # 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;
+    }
+
     # 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