Bug#39972 mysql-test-run.pl: Confusing error message under special conditions
- Fix problem with for example ./mtr --timer, caused by new version of "Getopt::Long" - Evaluating the "$opt" variable as a string, returns the name of the parameter to be modified instead of "Getopt::Long::Callback" which is the class name
This commit is contained in:
parent
bb42e1ab05
commit
9c76ec9323
@ -45,10 +45,13 @@ our $reorder= 1;
|
||||
sub collect_option {
|
||||
my ($opt, $value)= @_;
|
||||
|
||||
# Evaluate $opt as string to use "Getopt::Long::Callback legacy API"
|
||||
my $opt_name = "$opt";
|
||||
|
||||
# Convert - to _ in option name
|
||||
$opt =~ s/-/_/g;
|
||||
$opt_name =~ s/-/_/g;
|
||||
no strict 'refs';
|
||||
${$opt}= $value;
|
||||
${$opt_name}= $value;
|
||||
}
|
||||
|
||||
use File::Basename;
|
||||
|
@ -44,12 +44,13 @@ our $timer= 1;
|
||||
sub report_option {
|
||||
my ($opt, $value)= @_;
|
||||
|
||||
# Convert - to _ in option name
|
||||
$opt =~ s/-/_/g;
|
||||
no strict 'refs';
|
||||
${$opt}= $value;
|
||||
# Evaluate $opt as string to use "Getopt::Long::Callback legacy API"
|
||||
my $opt_name = "$opt";
|
||||
|
||||
#print $name, " setting $opt to ", (defined $value? $value : "undef") ,"\n";
|
||||
# Convert - to _ in option name
|
||||
$opt_name =~ s/-/_/g;
|
||||
no strict 'refs';
|
||||
${$opt_name}= $value;
|
||||
}
|
||||
|
||||
sub _name {
|
||||
|
Loading…
x
Reference in New Issue
Block a user