tange/parallel
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/parallel.git synced 2024-11-25 23:47:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

parallel: --sqlmaster +DBURL works with different commands.

Browse source
This commit is contained in:
Ole Tange 2017-01-13 15:47:13 +01:00
parent 84f4a855a5
commit 01088177aa
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/parallel
View file

@ -1259,7 +1259,7 @@ sub check_invalid_option_combinations {
sub init_globals { sub init_globals {
# Defaults: # Defaults:
$Global::version = 20170101; $Global::version = 20170111;
$Global::progname = 'parallel'; $Global::progname = 'parallel';
$Global::infinity = 2**31; $Global::infinity = 2**31;
$Global::debug = 0; $Global::debug = 0;
@ -9187,6 +9187,8 @@ sub replaced {
# $self is actually a CommandLine-object, # $self is actually a CommandLine-object,
# but it looks nice to be able to say {= $job->slot() =} # but it looks nice to be able to say {= $job->slot() =}
my $job = $self; my $job = $self;
$perl_expressions_as_re =
join("|", map {s/^-?\d+//; "\Q$_\E"} keys %{$self->{'replacecount'}});
# Fish out the words that have replacement strings in them # Fish out the words that have replacement strings in them
for my $word ( for my $word (
fish_out_words_containing_replacement_strings()) { fish_out_words_containing_replacement_strings()) {
@ -9197,13 +9199,11 @@ sub replaced {
# for each arg: # for each arg:
# replace replacement strings with replacement in the word value # replace replacement strings with replacement in the word value
# push to replace word value # push to replace word value
$perl_expressions_as_re ||=
join("|", map {s/^-?\d+//; "\Q$_\E"} keys %{$self->{'replacecount'}});
for my $arg (@$argref) { for my $arg (@$argref) {
my $val = $word; my $val = $word;
# Replace {= perl expr =} with value for each arg # Replace {= perl expr =} with value for each arg
$val =~ s{\257<(-?\d+)?($perl_expressions_as_re)\257>} $val =~ s{\257<(-?\d+)?($perl_expressions_as_re)\257>}
{ {
if($1) { if($1) {
# Positional replace # Positional replace
# Find the relevant arg and replace it # Find the relevant arg and replace it
@ -9216,7 +9216,7 @@ sub replaced {
$normal_replace ||= 1; $normal_replace ||= 1;
($arg ? $arg->replace($2,$quote_arg,$self) : ""); ($arg ? $arg->replace($2,$quote_arg,$self) : "");
} }
}goxe; }gxe;
if($quote) { if($quote) {
CORE::push(@{$replace{::shell_quote_scalar($word)}}, CORE::push(@{$replace{::shell_quote_scalar($word)}},
::shell_quote_scalar($val)); ::shell_quote_scalar($val));