Ignore:
Timestamp:
Aug 30, 2017, 5:07:44 PM (23 months ago)
Author:
bruno
Message:

Fix the merge of YAML conf files in pb_conf_cache
(Up to 3 levels of keys for now)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/lib/ProjectBuilder/Conf.pm

    r2261 r2263  
    230230
    231231    pb_log(1,"Loading YAML conf file $cf\n");
    232     $lh = $ldfunc->($cf);
     232    my $lh0 = $ldfunc->($cf);
     233    foreach my $k (keys %$lh0) {
     234        if (defined $lh->{$k}) {
     235            foreach my $k2 (keys %{$lh0->{$k}}) {
     236                $lh->{$k}->{$k2} = $lh0->{$k}->{$k2};
     237            }
     238        } else {
     239            $lh->{$k} = $lh0->{$k};
     240        }
     241    }
    233242}
    234243return($lh);
     
    549558my $lh1;
    550559$lh0 = pb_conf_cache($orig,$lh0);
    551 pb_log(2,"lh0:\n",Dumper($lh0),"\n");
     560pb_log(2,"lh0:\n".Dumper($lh0)."\n");
    552561$PBCONFVER = $pbconfverbkp;
    553562
Note: See TracChangeset for help on using the changeset viewer.