Changeset 16407

Show
Ignore:
Timestamp:
15.07.2008 13:13:16 (11 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/perllib/g2futil.pm

    r16406 r16407  
    288288    # CATALINA_HOME is set to GS' own tomcat. Since we'll be working with fedora, we need 
    289289    # to temporarily set CATALINA_HOME to fedora's tomcat. (Catalina is undefined for GS2). 
    290     my $gs_catalina_home = $ENV{'CATALINA_HOME'}; 
    291     if(defined $gs_catalina_home) { 
    292     $ENV{'CATALINA_HOME'} = &util::filename_cat($ENV{'FEDORA_HOME'}, "tomcat"); 
    293     } 
    294  
     290    my $gs_catalina_home = $ENV{'CATALINA_HOME'} if defined $ENV{'CATALINA_HOME'}; 
     291    $ENV{'CATALINA_HOME'} = &util::filename_cat($ENV{'FEDORA_HOME'}, "tomcat"); 
     292     
    295293    # 1. Find out which folder to write to: fedora_host or localhost  
    296294    # whichever contains fedora.xml is the one we want (if none, exit with error value?) 
     
    374372 
    375373    # reset CATALINA_HOME to GS' Tomcat (it is undefined for GS2 since GS2 has no tomcat): 
    376     if(defined $gs_catalina_home) { 
    377     $ENV{'CATALINA_HOME'} = $gs_catalina_home; 
    378     } 
    379  
     374    $ENV{'CATALINA_HOME'} = $gs_catalina_home if defined $gs_catalina_home; 
     375     
    380376    # Starting up the Fedora server takes a long time. We need to wait for the server to be 
    381377    # ready before import can continue, because g2f-import relies on an up-and-running Fedora