Changeset 1225

Timestamp:

02/26/11 19:01:37 (2 years ago)

Author:

bruno

Message:

• postpone execution of pbinit after all files have been filtered so that e.g. a configure.in be filtered before a bootstrap script being executed and all variables expanded correctly. Case of MondoRescue?

File:

• devel/pb/bin/pb (modified) (2 diffs)

devel/pb/bin/pb

@@ -892 +892 @@
         my $ptr = pb_get_filters($pbpkg);
 
-        # TODO: Make it CMS aware
-        # Execute the pbinit script if any
-        if (-x "$ENV{'PBROOTDIR'}/$pbpkg/pbinit") {
-            pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$pb);
-            chmod 0755,"$ENV{'PBTMP'}/pbinit";
-            pb_system("cd $dest ; $ENV{'PBTMP'}/pbinit","Executing init script from $ENV{'PBROOTDIR'}/$pbpkg/pbinit","verbose");
-        }
-
         # Do not do that for website
         if (not defined $web) {
@@ -1085 +1077 @@
             pb_log(2,"Files ".$liste."have been filtered\n");
 
+            # TODO: Make it CMS aware
+            # Execute the pbinit script if any
+            if (-x "$ENV{'PBROOTDIR'}/$pbpkg/pbinit") {
+                pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$pb);
+                chmod 0755,"$ENV{'PBTMP'}/pbinit";
+                pb_system("cd $dest ; $ENV{'PBTMP'}/pbinit","Executing init script from $ENV{'PBROOTDIR'}/$pbpkg/pbinit under $dest","verbose");
+            }
+
             # Do we have additional script to run to prepare the environement for the project ? 
             # Then include it in the pbconf delivery