Changeset 473 in ProjectBuilder for devel/pb-modules

Timestamp:

Jun 4, 2008, 3:04:36 AM (17 years ago)

Author:

Bruno Cornec

Message:

Working announce action for pb

File:

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

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

@@ -126 +126 @@
 The first parameter is the shell command to call.
 The second parameter is the message to print on screen. If none is given, then the command is printed.
+The third parameter print the result of the command after correct execution if value is verbose. If value is noredir, it avoids redirecting outputs (e.g. for vi).
 This function returns the result the return value of the system command.
 
@@ -137 +138 @@
 my $cmt=shift || $cmd;
 my $verbose=shift || undef;
+my $redir = "";
 
 pb_log(0,"$cmt... ");
 pb_log(1,"Executing $cmd\n");
-system("$cmd 2>&1 > $ENV{'PBTMP'}/system.log");
+$redir = "2>&1 > $ENV{'PBTMP'}/system.log" if ((! defined $verbose) || ($verbose ne "noredir"));
+system("$cmd $redir");
 my $res = $?;
 if ($res == -1) {
     pb_log(0,"failed to execute ($cmd): $!\n");
-    pb_display_file("$ENV{'PBTMP'}/system.log");
+    pb_display_file("$ENV{'PBTMP'}/system.log") if (-f "$ENV{'PBTMP'}/system.log");
 } elsif ($res & 127) {
     pb_log(0, "child ($cmd) died with signal ".($? & 127).", ".($? & 128) ? 'with' : 'without'." coredump\n");
-    pb_display_file("$ENV{'PBTMP'}/system.log");
+    pb_display_file("$ENV{'PBTMP'}/system.log") if (-f "$ENV{'PBTMP'}/system.log");
 } elsif ($res == 0) {
     pb_log(0,"OK\n");
-    pb_display_file("$ENV{'PBTMP'}/system.log") if (defined $verbose);
+    pb_display_file("$ENV{'PBTMP'}/system.log") if ((defined $verbose) && (-f "$ENV{'PBTMP'}/system.log"));
 } else {
     pb_log(0, "child ($cmd) exited with value ".($? >> 8)."\n");
-    pb_display_file("$ENV{'PBTMP'}/system.log");
+    pb_display_file("$ENV{'PBTMP'}/system.log") if (-f "$ENV{'PBTMP'}/system.log");
 }
 return($res);