Changeset 1552 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Filter.pm

Timestamp:

May 21, 2012, 2:57:56 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. 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.
• 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.

File:

• devel/pb/lib/ProjectBuilder/Filter.pm (modified) (2 diffs)

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -64 +64 @@
 
 my @ffiles;
-my ($ffile00, $ffile0, $ffile1, $ffile2, $ffile3, $ffile4, $ffile5);
-my ($mfile00, $mfile0, $mfile1, $mfile2, $mfile3, $mfile4, $mfile5);
 my $pbpkg = shift || die "No package specified";
 my $pbos = shift;
@@ -72 +70 @@
 
 pb_log(2,"Entering pb_get_filters - pbpkg: $pbpkg - pbos: ".Dumper($pbos)."\n");
-# Global filter files first, then package specificities
-if (-d "$ENV{'PBROOTDIR'}/pbfilter") {
-    $mfile00 = "$ENV{'PBROOTDIR'}/pbfilter/all.pbf" if (-f "$ENV{'PBROOTDIR'}/pbfilter/all.pbf");
-    if (defined $pbos) {
-        $mfile0 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'os'}.pbf" if ((defined $pbos->{'os'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'os'}.pbf"));
-        $mfile1 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'type'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'type'}.pbf"));
-        $mfile2 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'family'}.pbf" if ((defined $pbos->{'family'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'family'}.pbf"));
-        $mfile3 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}.pbf" if ((defined $pbos->{'name'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}.pbf"));
-        $mfile4 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}-$pbos->{'version'}.pbf" if ((defined $pbos->{'name'}) && (defined $pbos->{'version'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}-$pbos->{'version'}.pbf"));
-        $mfile5 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.pbf" if ((defined $pbos->{'name'}) && (defined $pbos->{'version'}) && (defined $pbos->{'arch'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.pbf"));
-    }
-
-    push @ffiles,$mfile00 if (defined $mfile00);
-    push @ffiles,$mfile0 if (defined $mfile0);
-    push @ffiles,$mfile1 if (defined $mfile1);
-    push @ffiles,$mfile2 if (defined $mfile2);
-    push @ffiles,$mfile3 if (defined $mfile3);
-    push @ffiles,$mfile4 if (defined $mfile4);
-    push @ffiles,$mfile5 if (defined $mfile5);
-}
-
-if (-d "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter") {
-    $ffile00 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/all.pbf" if (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/all.pbf");
-    if (defined $pbos) {
-        $ffile0 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'os'}.pbf" if ((defined $pbos->{'os'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'os'}.pbf"));
-        $ffile1 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'type'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'type'}.pbf"));
-        $ffile2 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'family'}.pbf" if ((defined $pbos->{'family'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'family'}.pbf"));
-        $ffile3 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}.pbf" if ((defined $pbos->{'name'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}.pbf"));
-        $ffile4 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}-$pbos->{'version'}.pbf" if ((defined $pbos->{'name'}) && (defined $pbos->{'version'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}-$pbos->{'version'}.pbf"));
-        $ffile5 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.pbf" if ((defined $pbos->{'name'}) && (defined $pbos->{'version'}) && (defined $pbos->{'arch'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.pbf"));
-    }
-    push @ffiles,$ffile00 if (defined $ffile00);
-    push @ffiles,$ffile0 if (defined $ffile0);
-    push @ffiles,$ffile1 if (defined $ffile1);
-    push @ffiles,$ffile2 if (defined $ffile2);
-    push @ffiles,$ffile3 if (defined $ffile3);
-    push @ffiles,$ffile4 if (defined $ffile4);
-    push @ffiles,$ffile5 if (defined $ffile5);
-}
+
+# Global filter files first, then package specific
+my @file_basenames = ('all');
+@file_basenames = reverse pb_pbos_to_keylist($pbos, 'all') if (defined $pbos);
+# Build list of all filter files
+foreach my $dir ("$ENV{PBROOTDIR}/pbfilter", "$ENV{PBROOTDIR}/$pbpkg/pbfilter") {
+    foreach my $file_basename (@file_basenames) {
+        my $path = "$dir/${file_basename}.pbf";
+        push(@ffiles, $path) if -f $path;
+    }
+}
+
 if (@ffiles) {
     pb_log(2,"DEBUG ffiles: ".Dumper(\@ffiles)."\n");