[ARVADOS] updated: fb1bf9fde205adb90386c81214e667823708a9f1
git at public.curoverse.com
git at public.curoverse.com
Tue Oct 28 01:37:19 EDT 2014
Summary of changes:
sdk/cli/bin/crunch-job | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
via fb1bf9fde205adb90386c81214e667823708a9f1 (commit)
from 30bdc9b4fd57e2291f2ace690412d1775eb6e6ab (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit fb1bf9fde205adb90386c81214e667823708a9f1
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Oct 28 01:06:02 2014 -0400
3824: Fix up logging messages.
diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index fff5e7b..1ebe746 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";
}
}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list