From: Tom Clegg <tom@curoverse.com>
Date: Tue, 28 Oct 2014 05:06:02 +0000 (-0400)
Subject: 3824: Fix up logging messages.
X-Git-Tag: 1.1.0~2051^2~10
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/fb1bf9fde205adb90386c81214e667823708a9f1

3824: Fix up logging messages.
---

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index fff5e7bbe3..1ebe746682 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -1570,7 +1570,13 @@ sub srun
   my $stdin = shift;
   my $args = $have_slurm ? [@$srunargs, @$execargs] : $execargs;
 
-  my $show_cmd = "@{$args}";
+  my $show_cmd = join(" ", map {
+    if (/[\s\"]/) {
+      s/[\"\$\\]/\\$&/g;
+      "\"$_\"";
+    } else {
+      $_;
+    }} @{$args});
   $show_cmd =~ s/(TOKEN\\*=)\S+/${1}[...]/g;
   $show_cmd =~ s/\n/ /g;
   warn "starting: $show_cmd\n";
@@ -1796,7 +1802,7 @@ sub shell_or_die
     my $exitstatus = sprintf("exit %d signal %d", $? >> 8, $? & 0x7f);
     open STDERR, ">&STDERR_ORIG";
     system ("cat $destdir.log >&2");
-    die "@_ failed ($!): $exitstatus";
+    die "@_ failed: $exitstatus";
   }
 }