mirror of
https://git.savannah.gnu.org/git/parallel.git
synced 2024-11-22 14:07:55 +00:00
parallel: --sqlmaster +DBURL works with different commands.
This commit is contained in:
parent
84f4a855a5
commit
01088177aa
|
@ -1259,7 +1259,7 @@ sub check_invalid_option_combinations {
|
|||
|
||||
sub init_globals {
|
||||
# Defaults:
|
||||
$Global::version = 20170101;
|
||||
$Global::version = 20170111;
|
||||
$Global::progname = 'parallel';
|
||||
$Global::infinity = 2**31;
|
||||
$Global::debug = 0;
|
||||
|
@ -9187,6 +9187,8 @@ sub replaced {
|
|||
# $self is actually a CommandLine-object,
|
||||
# but it looks nice to be able to say {= $job->slot() =}
|
||||
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
|
||||
for my $word (
|
||||
fish_out_words_containing_replacement_strings()) {
|
||||
|
@ -9197,8 +9199,6 @@ sub replaced {
|
|||
# for each arg:
|
||||
# replace replacement strings with replacement in the word value
|
||||
# push to replace word value
|
||||
$perl_expressions_as_re ||=
|
||||
join("|", map {s/^-?\d+//; "\Q$_\E"} keys %{$self->{'replacecount'}});
|
||||
for my $arg (@$argref) {
|
||||
my $val = $word;
|
||||
# Replace {= perl expr =} with value for each arg
|
||||
|
@ -9216,7 +9216,7 @@ sub replaced {
|
|||
$normal_replace ||= 1;
|
||||
($arg ? $arg->replace($2,$quote_arg,$self) : "");
|
||||
}
|
||||
}goxe;
|
||||
}gxe;
|
||||
if($quote) {
|
||||
CORE::push(@{$replace{::shell_quote_scalar($word)}},
|
||||
::shell_quote_scalar($val));
|
||||
|
|
Loading…
Reference in a new issue