Changeset 236 in ProjectBuilder for devel

Timestamp:

Oct 22, 2007, 12:27:00 PM (18 years ago)

Author:

Bruno Cornec

Message:

Fix a bug for filtering non-build files, where filters were done in a per distro/ver loop.
Now only done once, after pbinit call thus also handling files it could have generated.
Only all.pbf has to be taken in account on those files => implies to reconfigure older pb project
to create systematically an all.pbf if additional files have to be filtered.
Should solve mondorescue build issues.

Location:

devel/pb

Files:

• bin/pb (modified) (2 diffs)
• lib/ProjectBuilder/Base.pm (modified) (3 diffs)

devel/pb/bin/pb

@@ -259 +259 @@
                     pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir,$pbpackager);
                 }
-                if (defined $filteredfiles->{$pbpkg}) {
-                    foreach my $f (split(/,/,$filteredfiles->{$pbpkg})) {
-                        pb_filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f",$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$pbpackager);
-                    }
-                }
             }
         }
@@ -282 +277 @@
             system("cd $dest ; $ENV{'PBCONF'}/$pbpkg/pbinit");
         }
+
+        # Get the generic filter (all.pbf) and 
+        # apply those to the non-build files including those
+        # generated by pbinit if applicable
+
+        # Get only all.pbf filter
+        my $ptr = pb_get_filters($pbpkg);
+
+        my $liste ="";
+        if (defined $filteredfiles->{$pbpkg}) {
+            foreach my $f (split(/,/,$filteredfiles->{$pbpkg})) {
+                pb_filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$pbpackager);
+                $liste = "$dest/$f $liste";
+            }
+        }
+        print "$liste have been filtered\n";
 
         # Archive dest dir

devel/pb/lib/ProjectBuilder/Base.pm

@@ -462 +462 @@
 my ($mfile00, $mfile0, $mfile1, $mfile2, $mfile3);
 my $pbpkg = shift || die "No package specified";
-my $dtype = shift || die "No dtype specified";
-my $dfam = shift || die "No dfam specified";
-my $ddir = shift || die "No ddir specified";
-my $dver = shift || die "No dver specified";
+my $dtype = shift || "";
+my $dfam = shift || "";
+my $ddir = shift || "";
+my $dver = shift || "";
 my $ptr; # returned value pointer on the hash of filters
 my %ptr;
@@ -520 +520 @@
 }
 
-# Function which applies filter on files (only for pb)
+# Function which applies filter on pb build files
 sub pb_filter_file_pb {
 
@@ -579 +579 @@
 my %filter=%$ptr;
 my $destfile=shift;
-my $pbsuf=shift;
 my $pbpkg=shift;
 my $pbver=shift;