[ARVADOS] updated: 1bcf9398f365411b2a82388dbd2eb1fd1d570fe5
git at public.curoverse.com
git at public.curoverse.com
Thu Oct 30 13:02:33 EDT 2014
Summary of changes:
sdk/cli/bin/crunch-job | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
via 1bcf9398f365411b2a82388dbd2eb1fd1d570fe5 (commit)
from 81bb05b5a18c9501057876bf5b0e1923778dad26 (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 1bcf9398f365411b2a82388dbd2eb1fd1d570fe5
Author: Tom Clegg <tom at curoverse.com>
Date: Thu Oct 30 13:00:05 2014 -0400
3824: Use Data::Dumper instead of custom quoting to show srun/task exec args.
diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 1ebe746..1a836f6 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -86,6 +86,7 @@ use POSIX ':sys_wait_h';
use POSIX qw(strftime);
use Fcntl qw(F_GETFL F_SETFL O_NONBLOCK);
use Arvados;
+use Data::Dumper;
use Digest::MD5 qw(md5_hex);
use Getopt::Long;
use IPC::Open2;
@@ -1570,14 +1571,10 @@ sub srun
my $stdin = shift;
my $args = $have_slurm ? [@$srunargs, @$execargs] : $execargs;
- my $show_cmd = join(" ", map {
- if (/[\s\"]/) {
- s/[\"\$\\]/\\$&/g;
- "\"$_\"";
- } else {
- $_;
- }} @{$args});
- $show_cmd =~ s/(TOKEN\\*=)\S+/${1}[...]/g;
+ $Data::Dumper::Terse = 1;
+ $Data::Dumper::Indent = 0;
+ my $show_cmd = Dumper($args);
+ $show_cmd =~ s/(TOKEN\\*=)[^\s\']+/${1}[...]/g;
$show_cmd =~ s/\n/ /g;
warn "starting: $show_cmd\n";
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list