← Back to branch summary

~percona-toolkit-dev/percona-toolkit/ptc-errors-on-slave-with-different-time-zone-1388870

« back to all changes in this revision

Viewing changes to bin/pt-agent

Merge fix-pt-archiver-dry-run-bug-1199589 and make 2.2.4 release dates in Changelog and release_notes.pod match.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/pt-agent
2963
2963
   my $long = exists $self->{opts}->{$opt}       ? $opt
2964
2964
            : exists $self->{short_opts}->{$opt} ? $self->{short_opts}->{$opt}
2965
2965
            : die "Getopt::Long gave a nonexistent option: $opt";
2966
 
 
2967
2966
   $opt = $self->{opts}->{$long};
2968
2967
   if ( $opt->{is_cumulative} ) {
2969
2968
      $opt->{value}++;
2970
2969
   }
 
2970
   elsif ( ($opt->{type} || '') eq 's' && $val =~ m/^--?(.+)/ ) {
 
2971
      my $next_opt = $1;
 
2972
      if (    exists $self->{opts}->{$next_opt}
 
2973
           || exists $self->{short_opts}->{$next_opt} ) {
 
2974
         $self->save_error("--$long requires a string value");
 
2975
         return;
 
2976
      }
 
2977
      else {
 
2978
         $opt->{value} = $val;
 
2979
      }
 
2980
   }
2971
2981
   else {
2972
2982
      $opt->{value} = $val;
2973
2983
   }
9381
9391
 
9382
9392
=head1 VERSION
9383
9393
 
9384
 
pt-agent 2.2.3
 
9394
pt-agent 2.2.4
9385
9395
 
9386
9396
=cut