Changeset 2263 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Conf.pm

Timestamp:

Aug 30, 2017, 5:07:44 PM (7 years ago)

Author:

Bruno Cornec

Message:

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

File:

• devel/pb-modules/lib/ProjectBuilder/Conf.pm (modified) (2 diffs)

devel/pb-modules/lib/ProjectBuilder/Conf.pm

@@ -230 +230 @@
 
     pb_log(1,"Loading YAML conf file $cf\n");
-    $lh = $ldfunc->($cf);
+    my $lh0 = $ldfunc->($cf);
+    foreach my $k (keys %$lh0) {
+        if (defined $lh->{$k}) {
+            foreach my $k2 (keys %{$lh0->{$k}}) {
+                $lh->{$k}->{$k2} = $lh0->{$k}->{$k2};
+            }
+        } else {
+            $lh->{$k} = $lh0->{$k};
+        }
+    }
 }
 return($lh);
@@ -549 +558 @@
 my $lh1;
 $lh0 = pb_conf_cache($orig,$lh0);
-pb_log(2,"lh0:\n",Dumper($lh0),"\n");
+pb_log(2,"lh0:\n".Dumper($lh0)."\n");
 $PBCONFVER = $pbconfverbkp;