Changeset 2261 in ProjectBuilder

Timestamp:

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

Author:

Bruno Cornec

Message:

Log when handling YAML conf files the filename

Fix also temp pbrc.yml generation in pb

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Conf.pm (modified) (2 diffs)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (1 diff)
• pb/bin/pb (modified) (1 diff)

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

@@ -229 +229 @@
     }
 
+    pb_log(1,"Loading YAML conf file $cf\n");
     $lh = $ldfunc->($cf);
 }
@@ -353 +354 @@
     }
 
+    pb_log(1,"Writing YAML conf file $conffile\n");
     print CONF $dpfunc->($h);
 }

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

@@ -546 +546 @@
 my $pbos = shift;
 
-return(pb_distro_setuprepo_gen_conf($pbos,"$ENV{'PBDESTDIR'}/pbrc","addrepo"));
+return(pb_distro_setuprepo_gen_conf($pbos,"$ENV{'PBDESTDIR'}/pbrc.yml","addrepo"));
 }
 

devel/pb/bin/pb

@@ -1619 +1619 @@
     open(PKG,"> $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.yml") || die "Unable to create $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.yml";
     print PKG "---\n";
+    print PKG "pbpkg:\n";
     foreach my $pbpkg (keys %pkgs) {
-        print PKG "pbpkg:\n";
         print PKG "  $pbpkg: $pkgs{$pbpkg}\n";
     }