Changeset 1553


Ignore:
Timestamp:
May 21, 2012, 3:06:00 AM (7 years ago)
Author:
bruno
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:
3 edited

Legend:

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

    r1540 r1553  
    3333 
    3434our @ISA = qw(Exporter);
    35 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);
     35our @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);
    3636($VERSION,$REVISION) = pb_version_init();
    3737
     
    605605}
    606606
    607 =item B<pb_pbos_to_keylist>
    608 
    609 Given a pbos object and the generic key, get the list of possible keys for looking up variable for
     607=item B<pb_distro_to_keylist>
     608
     609Given a pbos object (first param) and the generic key (second param), get the list of possible keys for looking up variable for
    610610filter names.  The list will be sorted most-specific to least specific.
    611611
    612612=cut
    613613
    614 sub pb_pbos_to_keylist ($$) {
     614sub pb_distro_to_keylist ($$) {
    615615
    616616my ($pbos, $generic) = @_;
     
    648648my $pbos = shift;
    649649
    650 my @keylist = pb_pbos_to_keylist($pbos,"default");
     650my @keylist = pb_distro_to_keylist($pbos,"default");
    651651pb_log(2,"DEBUG: pb_distro_get_param on $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} for ".Dumper(@_)."\n");
    652652foreach my $opt (@_) {
  • devel/pb/bin/pb

    r1552 r1553  
    42934293my $pbtarget = shift;
    42944294
    4295 my $dists = ("$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}");
     4295my @dists = ("$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}");
    42964296
    42974297# Get list of distributions for which we need to generate build files if no target
  • devel/pb/lib/ProjectBuilder/Filter.pm

    r1552 r1553  
    7373# Global filter files first, then package specific
    7474my @file_basenames = ('all');
    75 @file_basenames = reverse pb_pbos_to_keylist($pbos, 'all') if (defined $pbos);
     75@file_basenames = reverse pb_distro_to_keylist($pbos, 'all') if (defined $pbos);
    7676# Build list of all filter files
    7777foreach my $dir ("$ENV{PBROOTDIR}/pbfilter", "$ENV{PBROOTDIR}/$pbpkg/pbfilter") {
Note: See TracChangeset for help on using the changeset viewer.