Changeset 1115 in ProjectBuilder

Timestamp:

Nov 26, 2010, 12:54:28 PM (13 years ago)

Author:

Bruno Cornec

Message:

r4056@localhost: bruno | 2010-11-25 19:38:07 +0100

• Fix a bug in pb_system when using redirctions in the command

Location:

devel/pb-modules

Files:

• etc/pb.conf.pod (modified) (1 diff)
• lib/ProjectBuilder/Base.pm (modified) (1 diff)

devel/pb-modules/etc/pb.conf.pod

@@ -576 +576 @@
  Nature: Optional
  Key: project (as defined in the -p option or PBPROJ environment variable)
- Value: Target directory containing the web content in the project that should be delivered when using the web2ssh command of pb.
+ Value: Target directory containing the web content in the project that should be delivered when using the sbx|cms2webssh|pkg command of pb.
  Conffile: project
  Example: webdir mondorescue = website

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

@@ -148 +148 @@
 unlink("$ENV{'PBTMP'}/system.log") if (-f "$ENV{'PBTMP'}/system.log");
 $redir = "2>> $ENV{'PBTMP'}/system.log 1>> $ENV{'PBTMP'}/system.log" if ((! defined $verbose) || ($verbose ne "noredir"));
+# If there is a redirection in the command, then do not redirect in system.log 
+# as you won't get the redirection working as expected
+$redir = "" if ($cmd =~ /\>/);
 system("$cmd $redir");
 my $res = $?;