Changeset 500 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Base.pm

Timestamp:

Aug 3, 2008, 1:20:30 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Working patch support added to pb (tested with buffer)
• Filtering functions now handle also pointer on hashes (such as the new pb hash)
• Filtering functions support new macro for patch support (PBPATCHSRC and PBPATCHCMD)
• Env.pm now generates correct templates for patch support and uses the new pb hash
• pb_cms_export extended to support ​file:// URI, and also supports an undef second param (no local export available)
• In pb, hashes now include also the arch (for better patch support)
• pb supports local CMS based patches, as well as external references (not tested yet)
• New pb_get_arch function provided
• New parameters for pb_system (mayfail and quiet)

File:

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

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

@@ -152 +152 @@
 my $redir = "";
 
-pb_log(0,"$cmt... ");
+pb_log(0,"$cmt... ") if ($verbose ne "quiet");
 pb_log(1,"Executing $cmd\n");
 unlink("$ENV{'PBTMP'}/system.log") if (-f "$ENV{'PBTMP'}/system.log");
@@ -158 +158 @@
 system("$cmd $redir");
 my $res = $?;
+# Exit now if the command may fail
+if ((defined $verbose) and ($verbose eq "mayfail")) {
+    pb_log(0,"N/A\n") if ($res != 0);
+    pb_log(0,"OK\n") if ($res == 0);
+    return($res) 
+    }
 if ($res == -1) {
-    pb_log(0,"failed to execute ($cmd): $!\n");
-    pb_display_file("$ENV{'PBTMP'}/system.log") if (-f "$ENV{'PBTMP'}/system.log");
+    pb_log(0,"failed to execute ($cmd): $!\n") if ($verbose ne "quiet");
+    pb_display_file("$ENV{'PBTMP'}/system.log") if ((-f "$ENV{'PBTMP'}/system.log") and ($verbose ne "quiet"));
 } elsif ($res & 127) {
-    pb_log(0, "child ($cmd) died with signal ".($? & 127).", ".($? & 128) ? 'with' : 'without'." coredump\n");
-    pb_display_file("$ENV{'PBTMP'}/system.log") if (-f "$ENV{'PBTMP'}/system.log");
+    pb_log(0, "child ($cmd) died with signal ".($? & 127).", ".($? & 128) ? 'with' : 'without'." coredump\n") if ($verbose ne "quiet");
+    pb_display_file("$ENV{'PBTMP'}/system.log") if ((-f "$ENV{'PBTMP'}/system.log") and ($verbose ne "quiet"));
 } elsif ($res == 0) {
-    pb_log(0,"OK\n");
-    pb_display_file("$ENV{'PBTMP'}/system.log") if ((defined $verbose) && (-f "$ENV{'PBTMP'}/system.log"));
+    pb_log(0,"OK\n") if ($verbose ne "quiet");
+    pb_display_file("$ENV{'PBTMP'}/system.log") if ((defined $verbose) and (-f "$ENV{'PBTMP'}/system.log") and ($verbose ne "quiet"));
 } else {
-    pb_log(0, "child ($cmd) exited with value ".($? >> 8)."\n");
-    pb_display_file("$ENV{'PBTMP'}/system.log") if (-f "$ENV{'PBTMP'}/system.log");
+    pb_log(0, "child ($cmd) exited with value ".($? >> 8)."\n") if ($verbose ne "quiet");
+    pb_display_file("$ENV{'PBTMP'}/system.log") if ((-f "$ENV{'PBTMP'}/system.log") and ($verbose ne "quiet"));
 }
 return($res);