Subversion Repositories camp_sysinfo_client_3

Rev

Rev 111 | Rev 114 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 111 Rev 112
Line 204... Line 204...
204 
sub makeConfig {
 204 
sub makeConfig {
205 
   my @configFileNames = @_;
 205 
   my @configFileNames = @_;
206 
   my %config;
 206 
   my %config;
207 
 
 207 
 
208 
   foreach my $config ( @configFileNames ) {
 208 
   foreach my $config ( @configFileNames ) {
209 
      my $thisConfig = readConfig( $config );
 209 
      my $thisConfig = &readConfig( $config );
210 
      # add the new config to %config, overwriting any existing keys which are duplicated
 210 
      # add the new config to %config, overwriting any existing keys which are duplicated
211 
      @config{keys %$thisConfig} = values %$thisConfig;
 211 
      @config{keys %$thisConfig} = values %$thisConfig;
212 
   }
 212 
   }
213 
   # now, ensure the correct values are loaded in some areas
 213 
   # now, ensure the correct values are loaded in some areas
214 
   unless ( $config{'hostname'} ) {
 214 
   unless ( $config{'hostname'} ) {