This commit is contained in:
Ole Tange 2015-01-06 23:25:23 +01:00
parent 8d3bc91cc0
commit 3d01e955bf
4 changed files with 20 additions and 10 deletions

View file

@ -949,7 +949,7 @@ sub parse_options {
sub init_globals { sub init_globals {
# Defaults: # Defaults:
$Global::version = 20150101; $Global::version = 20150106;
$Global::progname = 'parallel'; $Global::progname = 'parallel';
$Global::infinity = 2**31; $Global::infinity = 2**31;
$Global::debug = 0; $Global::debug = 0;
@ -2305,6 +2305,7 @@ sub parse_sshlogin {
# This may add to @Global::sshlogin - possibly bug # This may add to @Global::sshlogin - possibly bug
read_sshloginfile(expand_slf_shorthand($s)); read_sshloginfile(expand_slf_shorthand($s));
} else { } else {
$s =~ s/\s*$//;
push (@login, $s); push (@login, $s);
} }
} }

View file

@ -4274,18 +4274,20 @@ The error message you get (if any).
=item * =item *
The complete output of B<parallel --version>. If you are not running The complete output of B<parallel --version>. If you are not running
the latest released version you should specify why you believe the the latest released version (see http://ftp.gnu.org/gnu/parallel/) you
problem is not fixed in that version. should specify why you believe the problem is not fixed in that
version.
=item * =item *
A complete example that others can run that shows the problem. This A complete example that others can run that shows the problem
should preferably be small and simple. A combination of B<yes>, including all files needed to run the example. This should preferably
B<seq>, B<cat>, B<echo>, and B<sleep> can reproduce most errors. If be small and simple. A combination of B<yes>, B<seq>, B<cat>, B<echo>,
your example requires large files, see if you can make them by and B<sleep> can reproduce most errors. If your example requires large
something like B<seq 1000000> > B<file> or B<yes | head -n 10000000> > files, see if you can make them by something like B<seq 1000000> >
B<file>. If your example requires remote execution, see if you can B<file> or B<yes | head -n 10000000> > B<file>. If your example
use B<localhost> - maybe using another login. requires remote execution, see if you can use B<localhost> - maybe
using another login.
=item * =item *

View file

@ -32,4 +32,7 @@ echo '### --hostgroup -S @group1 -Sgrp2'
echo '### --hostgroup -S @group1+grp2' echo '### --hostgroup -S @group1+grp2'
parallel -S @g1+g2 -S @g1/1/tcsh@lo -S @g1/1/localhost -S @g2/1/parallel@lo whoami\;true ::: {1..6} | sort parallel -S @g1+g2 -S @g1/1/tcsh@lo -S @g1/1/localhost -S @g2/1/parallel@lo whoami\;true ::: {1..6} | sort
echo '### trailing space in sshlogin'
echo 'sshlogin trailing space' | parallel --sshlogin "ssh -l parallel localhost " echo
EOF EOF

View file

@ -87,3 +87,7 @@ tange
tange tange
tcsh tcsh
tcsh tcsh
echo '### trailing space in sshlogin'
### trailing space in sshlogin
echo 'sshlogin trailing space' | parallel --sshlogin "ssh -l parallel localhost " echo
sshlogin trailing space