Changeset 16398

Show
Ignore:
Timestamp:
14.07.2008 19:41:21 (11 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

Files:
1 modified

Legend:

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

    r16395 r16398  
    292292    # The top of this file has already made sure that FEDORA_HOME is set, but for GS3 
    293293    # CATALINA_HOME is set to GS' own tomcat. Since we'll be working with fedora, we need 
    294     # to temporarily set CATALINA_HOME to fedora's tomcat: 
     294    # to temporarily set CATALINA_HOME to fedora's tomcat. (Catalina is undefined for GS2). 
    295295    my $gs_catalina_home = $ENV{'CATALINA_HOME'}; 
    296     $ENV{'CATALINA_HOME'} = &util::filename_cat($ENV{'FEDORA_HOME'}, "tomcat"); 
     296    if(defined $gs_catalina_home) { 
     297    $ENV{'CATALINA_HOME'} = &util::filename_cat($ENV{'FEDORA_HOME'}, "tomcat"); 
     298    } 
    297299 
    298300    # 1. Find out which folder to write to: fedora_host or localhost  
     
    376378    } 
    377379 
    378     # reset CATALINA_HOME to GS' Tomcat: 
    379     $ENV{'CATALINA_HOME'} = $gs_catalina_home; 
    380      
     380    # reset CATALINA_HOME to GS' Tomcat (it is undefined for GS2 since GS2 has no tomcat): 
     381    if(defined $gs_catalina_home) { 
     382    $ENV{'CATALINA_HOME'} = $gs_catalina_home; 
     383    } 
     384 
    381385    # Starting up the Fedora server takes a long time. We need to wait for the server to be 
    382386    # ready before import can continue, because g2f-import relies on an up-and-running Fedora