tange/parallel
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/parallel.git synced 2024-11-26 07:57:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

parallel: Fixed bug #37680: --wd ... not working

Browse source
This commit is contained in:
Ole Tange 2012-11-26 21:19:14 +01:00
parent 6921d28f9a
commit 4688ba04c9
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/parallel
View file

@ -613,7 +613,7 @@ sub get_options_from_array {
sub parse_options { sub parse_options {
# Returns: N/A # Returns: N/A
# Defaults: # Defaults:
$Global::version = 20121124; $Global::version = 20121126;
$Global::progname = 'parallel'; $Global::progname = 'parallel';
$Global::infinity = 2**31; $Global::infinity = 2**31;
$Global::debug = 0; $Global::debug = 0;
@ -3711,6 +3711,10 @@ sub sshcleanup {
$cleancmd .= "$sshcmd $serverlogin rm -f " $cleancmd .= "$sshcmd $serverlogin rm -f "
. ::shell_quote_scalar($cleandir.$file.$removeworkdir).";"; . ::shell_quote_scalar($cleandir.$file.$removeworkdir).";";
} }
if(defined $opt::workdir and $opt::workdir eq "...") {
$cleancmd .= "$sshcmd $serverlogin rm -rf " . ::shell_quote_scalar($workdir).";";
}
return $cleancmd; return $cleancmd;
} }

4
testsuite/tests-to-run/test35.sh
View file

@ -41,5 +41,9 @@ stdout parallel -k --wd /tmp/ --basefile 1-col.txt --trc {}.5 -S .. -v echo ">"{
# A few rmdir errors are OK as we have multiple files in the same dirs # A few rmdir errors are OK as we have multiple files in the same dirs
find . -name '*.5' | sort find . -name '*.5' | sort
echo '### Test --wd ... --cleanup'
stdout parallel -k --wd ... --cleanup -S lo -v echo ">"{}.6 ::: uNiQuE_sTrInG
find ~/.parallel/tmp |grep uNiQuE_sTrInG
cd .. cd ..
rm -rf tmp rm -rf tmp

2
testsuite/wanted-results/test35
View file

@ -66,3 +66,5 @@ echo >./a\ b/cd\ /\ ef/efg.5
./a b/cd / ef/efg.5 ./a b/cd / ef/efg.5
./b/bar.5 ./b/bar.5
./b/foo.5 ./b/foo.5
### Test --wd ... --cleanup
echo >uNiQuE_sTrInG.6