Changeset 2155 in ProjectBuilder

Timestamp:

Dec 23, 2016, 1:16:18 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Now fix pb_distro_conf_print and place project after distros to have the right value for them. Will need a YAML conf file to solve fully

File:

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

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

@@ -766 +766 @@
 my %rep;
 my $i = 0;
-# Index on prj
+# Index on distro
+foreach my $r (pb_distro_get_param($pbos,pb_conf_get(@keys))) {
+    $rep{$keys[$i]} = $r if (defined $keys[$i]);
+    $i++;
+}
+$i = 0;
+# Then Index on prj to overwrite previous value if needed
 foreach my $r (pb_conf_get(@keys)) {
     $rep{$keys[$i]} = $r->{'default'} if (defined  $r->{'default'});
@@ -772 +778 @@
     $i++;
 }
-# Index on distro
-$i = 0;
-foreach my $r (pb_distro_get_param($pbos,pb_conf_get(@keys))) {
-    $rep{$keys[$i]} = $r if (defined $keys[$i]);
-    $i++;
-}
 foreach my $r (keys %rep) {
     print "$r => " if (defined $ldebug);