Changeset 1711 in ProjectBuilder

Timestamp:

Mar 9, 2013, 10:20:21 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Adds the possibility to prefix the output of commands executed by pb_system, if the verbose keyword is of the form verbose_prefix

File:

• devel/pb-modules/lib/ProjectBuilder/Base.pm (modified) (6 diffs)

devel/pb-modules/lib/ProjectBuilder/Base.pm

@@ -135 +135 @@
 The first parameter is the shell command to call. This command should NOT use redirections.
 The second parameter is the message to print on screen. If none is given, then the command is printed.
-The third parameter prints the result of the command after correct execution if value is "verbose". If value is "noredir", it avoids redirecting outputs (e.g. for vi). If value is "quiet", doesn't print anything at all. If value is "mayfail", failure of the command is ok even if $Global::pb_stop_on_error is set, because the caller will be handling the error. A "verbose" can be added to mayfail to have it explain why it failed
+The third parameter prints the result of the command after correct execution if value is "verbose". If value is "noredir", it avoids redirecting outputs (e.g. for vi). If value is "quiet", doesn't print anything at all. If value is "mayfail", failure of the command is ok even if $Global::pb_stop_on_error is set, because the caller will be handling the error. A "verbose" can be added to mayfail to have it explain why it failed. If value is verbose_PREF, then every output command will be prefixed with PREF.
 This function returns as a result the return value of the system command.
 
@@ -163 +163 @@
     pb_log(0,"NOT OK but non blocking\n") if ($res != 0);
     pb_log(0,"OK\n") if ($res == 0);
-    pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((-f "$ENV{'PBTMP'}/system.$$.log") and (defined $verbose) and ($verbose =~ /verbose/));
+    pb_display_file("$ENV{'PBTMP'}/system.$$.log",undef,$verbose) if ((-f "$ENV{'PBTMP'}/system.$$.log") and (defined $verbose) and ($verbose =~ /verbose/));
     return($res) 
 }
@@ -175 +175 @@
 if (defined $error) {
     pb_log(0, $error) if (((! defined $verbose) || ($verbose ne "quiet")) || ($Global::pb_stop_on_error));
-    pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((-f "$ENV{'PBTMP'}/system.$$.log") and ((! defined $verbose) || ($verbose ne "quiet") || $Global::pb_stop_on_error));
+    pb_display_file("$ENV{'PBTMP'}/system.$$.log",undef,$verbose) if ((-f "$ENV{'PBTMP'}/system.$$.log") and ((! defined $verbose) || ($verbose ne "quiet") || $Global::pb_stop_on_error));
     if ($Global::pb_stop_on_error) {
         confess("ERROR running command ($cmd) with cwd=$cwd, pid=$$");
@@ -183 +183 @@
 } else {
     pb_log(0,"OK\n") if ((! defined $verbose) || ($verbose ne "quiet"));
-    pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((-f "$ENV{'PBTMP'}/system.$$.log") and (defined $verbose) and ($verbose ne "quiet"));
+    pb_display_file("$ENV{'PBTMP'}/system.$$.log",undef,$verbose) if ((-f "$ENV{'PBTMP'}/system.$$.log") and (defined $verbose) and ($verbose ne "quiet"));
 }
 
@@ -290 +290 @@
 =item B<pb_display_file>
 
-This function print the content of the file passed in parameter.
+This function prints the content of the file passed in parameter.
 If a second parameter is given, this is the descriptor of the logfile to write to in addtion to STDOUT.
+If a third parameter is given, this is the prefix providing it's writen as verbose_PREF. In which case the PREF string will be added before the line output.
 
 This is a cat equivalent function.
@@ -301 +302 @@
 my $file=shift;
 my $desc=shift || undef;
+my $prefix=shift;
 
 return if (not -f $file);
 my $cnt = pb_get_content($file);
-print "$cnt\n";
-print $desc "$cnt\n" if (defined $desc);
+# If we have a prefix, then add it at each line
+if ((defined $prefix) and ($prefix =~ "_")) {
+    $prefix =~ s/verbose_//;
+    $cnt =~ s/\n/\n$prefix/g;
+} else {
+    $prefix = "";
+}
+print "$prefix$cnt\n";
+print $desc "$prefix$cnt\n" if (defined $desc);
 }