Changeset 298

Timestamp:

01/23/08 17:02:57 (5 years ago)

Author:

bruno

Message:

Addition of pbproj as a filtered variable for dploy needs also in pb_filter_file

Location:

devel/pb

Files:

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

devel/pb/bin/pb

@@ -305 +305 @@
         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);
+                pb_filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f",$ENV{'PBPROJ'},$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$pbpackager);
                 $liste = "$f $liste";
             }
@@ -313 +313 @@
         # Prepare the dest directory for archive
         if (-x "$ENV{'PBCONF'}/$pbpkg/pbinit") {
-            pb_filter_file("$ENV{'PBCONF'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$pbpackager);
+            pb_filter_file("$ENV{'PBCONF'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$ENV{'PBPROJ'},$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$pbpackager);
             chmod 0755,"$ENV{'PBTMP'}/pbinit";
             pb_system("cd $dest ; $ENV{'PBTMP'}/pbinit","Executing init script from $ENV{'PBCONF'}/$pbpkg/pbinit");

devel/pb/lib/ProjectBuilder/Base.pm

@@ -1131 +1131 @@
 my %filter=%$ptr;
 my $destfile=shift;
+my $pbproj=shift;
 my $pbpkg=shift;
 my $pbver=shift;