Changeset 1553 in ProjectBuilder

Timestamp:

May 21, 2012, 3:06:00 AM (12 years ago)

Author:

Bruno Cornec

Message:

• pb: log when we start and finish the build, that's an important state. Add missing setting of all_ok to false that kept us from properly stopping on errors. Fix typos in comments (coma => comma). Greatly simplify pb_get_distros function by using split and join. Also remove whitespace since multi-line conf file support will cause that to be added. (Eric Anderson)
• Filter.pm: use new pb_pbos_to_keylist function to generate the list of basenames we want, and use a loop rather than lots of separate statements. Simplifies and makes more powerful this function. Also now guaranteed to maintain consistency with key lookups in the hash maps. (Eric Anderson)
• rename pb_pbos_to_keylist to pb_distro_to_keylist and make it public (Bruno Cornec)

Location:

devel

Files:

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

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

@@ -33 +33 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_distro_conffile pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_get_param pb_distro_get_context);
+our @EXPORT = qw(pb_distro_conffile pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_get_param pb_distro_get_context pb_distro_to_keylist);
 ($VERSION,$REVISION) = pb_version_init();
 
@@ -605 +605 @@
 }
 
-=item B<pb_pbos_to_keylist>
-
-Given a pbos object and the generic key, get the list of possible keys for looking up variable for
+=item B<pb_distro_to_keylist>
+
+Given a pbos object (first param) and the generic key (second param), get the list of possible keys for looking up variable for
 filter names.  The list will be sorted most-specific to least specific.
 
 =cut
 
-sub pb_pbos_to_keylist ($$) {
+sub pb_distro_to_keylist ($$) {
 
 my ($pbos, $generic) = @_;
@@ -648 +648 @@
 my $pbos = shift;
 
-my @keylist = pb_pbos_to_keylist($pbos,"default");
+my @keylist = pb_distro_to_keylist($pbos,"default");
 pb_log(2,"DEBUG: pb_distro_get_param on $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} for ".Dumper(@_)."\n");
 foreach my $opt (@_) {

devel/pb/bin/pb

@@ -4293 +4293 @@
 my $pbtarget = shift;
 
-my $dists = ("$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}");
+my @dists = ("$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}");
 
 # Get list of distributions for which we need to generate build files if no target

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -73 +73 @@
 # Global filter files first, then package specific
 my @file_basenames = ('all');
-@file_basenames = reverse pb_pbos_to_keylist($pbos, 'all') if (defined $pbos);
+@file_basenames = reverse pb_distro_to_keylist($pbos, 'all') if (defined $pbos);
 # Build list of all filter files
 foreach my $dir ("$ENV{PBROOTDIR}/pbfilter", "$ENV{PBROOTDIR}/$pbpkg/pbfilter") {