From c7154acff18540ffe591c85905e21be2d53453a7 Mon Sep 17 00:00:00 2001 From: Daniel Nichter Date: Fri, 12 Aug 2011 09:05:46 -0600 Subject: [PATCH] Update OptionParser in all tools. --- bin/pt-archiver | 38 ++++++++++++++++++++---------------- bin/pt-config-diff | 38 ++++++++++++++++++++---------------- bin/pt-deadlock-logger | 38 ++++++++++++++++++++---------------- bin/pt-duplicate-key-checker | 38 ++++++++++++++++++++---------------- bin/pt-fifo-split | 38 ++++++++++++++++++++---------------- bin/pt-find | 38 ++++++++++++++++++++---------------- bin/pt-fk-error-logger | 38 ++++++++++++++++++++---------------- bin/pt-heartbeat | 38 ++++++++++++++++++++---------------- bin/pt-index-usage | 38 ++++++++++++++++++++---------------- bin/pt-kill | 38 ++++++++++++++++++++---------------- bin/pt-log-player | 38 ++++++++++++++++++++---------------- bin/pt-online-schema-change | 38 ++++++++++++++++++++---------------- bin/pt-query-advisor | 38 ++++++++++++++++++++---------------- bin/pt-query-digest | 38 ++++++++++++++++++++---------------- bin/pt-show-grants | 38 ++++++++++++++++++++---------------- bin/pt-slave-delay | 38 ++++++++++++++++++++---------------- bin/pt-slave-find | 38 ++++++++++++++++++++---------------- bin/pt-slave-restart | 38 ++++++++++++++++++++---------------- bin/pt-table-checksum | 38 ++++++++++++++++++++---------------- bin/pt-table-sync | 38 ++++++++++++++++++++---------------- bin/pt-tcp-model | 38 ++++++++++++++++++++---------------- bin/pt-trend | 38 ++++++++++++++++++++---------------- bin/pt-upgrade | 38 ++++++++++++++++++++---------------- bin/pt-variable-advisor | 38 ++++++++++++++++++++---------------- 24 files changed, 504 insertions(+), 408 deletions(-) diff --git a/bin/pt-archiver b/bin/pt-archiver index 019d9bb1..3c05f5c3 100755 --- a/bin/pt-archiver +++ b/bin/pt-archiver @@ -148,6 +148,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -472,9 +477,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -855,20 +863,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1023,6 +1017,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-config-diff b/bin/pt-config-diff index c92aa52f..541af798 100755 --- a/bin/pt-config-diff +++ b/bin/pt-config-diff @@ -148,6 +148,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -472,9 +477,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -855,20 +863,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1023,6 +1017,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-deadlock-logger b/bin/pt-deadlock-logger index cef408ab..f3c939c8 100755 --- a/bin/pt-deadlock-logger +++ b/bin/pt-deadlock-logger @@ -148,6 +148,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -472,9 +477,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -855,20 +863,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1023,6 +1017,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-duplicate-key-checker b/bin/pt-duplicate-key-checker index 794f6d9b..cd21cbdf 100755 --- a/bin/pt-duplicate-key-checker +++ b/bin/pt-duplicate-key-checker @@ -1370,6 +1370,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -1694,9 +1699,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -2077,20 +2085,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -2245,6 +2239,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-fifo-split b/bin/pt-fifo-split index dea92c51..7e3e7b4d 100755 --- a/bin/pt-fifo-split +++ b/bin/pt-fifo-split @@ -148,6 +148,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -472,9 +477,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -855,20 +863,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1023,6 +1017,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-find b/bin/pt-find index 2f63c66b..93714b97 100755 --- a/bin/pt-find +++ b/bin/pt-find @@ -504,6 +504,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -828,9 +833,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -1211,20 +1219,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1379,6 +1373,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-fk-error-logger b/bin/pt-fk-error-logger index e549e0b1..3e9d4e61 100755 --- a/bin/pt-fk-error-logger +++ b/bin/pt-fk-error-logger @@ -148,6 +148,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -472,9 +477,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -855,20 +863,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1023,6 +1017,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat index ba666273..1d4754ad 100755 --- a/bin/pt-heartbeat +++ b/bin/pt-heartbeat @@ -761,6 +761,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -1085,9 +1090,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -1468,20 +1476,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1636,6 +1630,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-index-usage b/bin/pt-index-usage index edacdd07..b1a94666 100755 --- a/bin/pt-index-usage +++ b/bin/pt-index-usage @@ -581,6 +581,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -905,9 +910,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -1288,20 +1296,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1456,6 +1450,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-kill b/bin/pt-kill index 44fae2f5..ea773bb9 100755 --- a/bin/pt-kill +++ b/bin/pt-kill @@ -148,6 +148,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -472,9 +477,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -855,20 +863,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1023,6 +1017,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-log-player b/bin/pt-log-player index 27f35b71..fdc7fe3b 100755 --- a/bin/pt-log-player +++ b/bin/pt-log-player @@ -148,6 +148,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -472,9 +477,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -855,20 +863,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1023,6 +1017,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change index dcf22706..5c6946eb 100755 --- a/bin/pt-online-schema-change +++ b/bin/pt-online-schema-change @@ -148,6 +148,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -472,9 +477,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -855,20 +863,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1023,6 +1017,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-query-advisor b/bin/pt-query-advisor index bf237e30..99b6834b 100755 --- a/bin/pt-query-advisor +++ b/bin/pt-query-advisor @@ -504,6 +504,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -828,9 +833,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -1211,20 +1219,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1379,6 +1373,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-query-digest b/bin/pt-query-digest index 946937f0..cdc1aa83 100755 --- a/bin/pt-query-digest +++ b/bin/pt-query-digest @@ -581,6 +581,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -905,9 +910,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -1288,20 +1296,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1456,6 +1450,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-show-grants b/bin/pt-show-grants index 5b8df342..8140dc16 100755 --- a/bin/pt-show-grants +++ b/bin/pt-show-grants @@ -148,6 +148,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -472,9 +477,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -855,20 +863,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1023,6 +1017,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay index 21403fed..26773dc6 100755 --- a/bin/pt-slave-delay +++ b/bin/pt-slave-delay @@ -148,6 +148,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -472,9 +477,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -855,20 +863,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1023,6 +1017,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-slave-find b/bin/pt-slave-find index fe7cbb19..1ba4d658 100755 --- a/bin/pt-slave-find +++ b/bin/pt-slave-find @@ -148,6 +148,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -472,9 +477,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -855,20 +863,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1023,6 +1017,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-slave-restart b/bin/pt-slave-restart index af1bc3d8..389c6588 100755 --- a/bin/pt-slave-restart +++ b/bin/pt-slave-restart @@ -225,6 +225,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -549,9 +554,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -932,20 +940,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1100,6 +1094,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum index c137f968..e13b1cb5 100755 --- a/bin/pt-table-checksum +++ b/bin/pt-table-checksum @@ -932,6 +932,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -1256,9 +1261,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -1639,20 +1647,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1807,6 +1801,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-table-sync b/bin/pt-table-sync index 220995a2..ec0fcb3c 100755 --- a/bin/pt-table-sync +++ b/bin/pt-table-sync @@ -148,6 +148,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -472,9 +477,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -855,20 +863,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1023,6 +1017,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-tcp-model b/bin/pt-tcp-model index 274cac85..da67725b 100755 --- a/bin/pt-tcp-model +++ b/bin/pt-tcp-model @@ -148,6 +148,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -472,9 +477,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -855,20 +863,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1023,6 +1017,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-trend b/bin/pt-trend index f48fbbb9..d0e52a54 100755 --- a/bin/pt-trend +++ b/bin/pt-trend @@ -148,6 +148,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -472,9 +477,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -855,20 +863,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1023,6 +1017,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-upgrade b/bin/pt-upgrade index f092747d..6c11d3a3 100755 --- a/bin/pt-upgrade +++ b/bin/pt-upgrade @@ -1287,6 +1287,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -1611,9 +1616,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -1994,20 +2002,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -2162,6 +2156,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ########################################################################### diff --git a/bin/pt-variable-advisor b/bin/pt-variable-advisor index b1e07ac8..e2d1bac6 100755 --- a/bin/pt-variable-advisor +++ b/bin/pt-variable-advisor @@ -148,6 +148,11 @@ sub get_specs { $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts); } + if ( $contents =~ m/^(Percona Toolkit v.+)$/m ) { + $self->{version} = $1; + MKDEBUG && _d($self->{version}); + } + return; } @@ -472,9 +477,12 @@ sub get_opts { ) or $self->save_error('Error parsing options'); if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) { - printf("%s Ver %s Distrib %s Changeset %s\n", - $self->{program_name}, $main::VERSION, $main::DISTRIB, $main::SVN_REV) - or die "Cannot print: $OS_ERROR"; + if ( $self->{version} ) { + print $self->{version}, "\n"; + } + else { + print "Error parsing version. See the VERSION section of the tool's documentation.\n"; + } exit 0; } @@ -855,20 +863,6 @@ sub prompt_noecho { return $response; } -if ( MKDEBUG ) { - print '# ', $^X, ' ', $], "\n"; - my $uname = `uname -a`; - if ( $uname ) { - $uname =~ s/\s+/ /g; - print "# $uname\n"; - } - printf("# %s Ver %s Distrib %s Changeset %s line %d\n", - $PROGRAM_NAME, ($main::VERSION || ''), ($main::DISTRIB || ''), - ($main::SVN_REV || ''), __LINE__); - print('# Arguments: ', - join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"); -} - sub _read_config_file { my ( $self, $filename ) = @_; open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n"; @@ -1023,6 +1017,16 @@ sub _d { print STDERR "# $package:$line $PID ", join(' ', @_), "\n"; } +if ( MKDEBUG ) { + print '# ', $^X, ' ', $], "\n"; + if ( my $uname = `uname -a` ) { + $uname =~ s/\s+/ /g; + print "# $uname\n"; + } + print '# Arguments: ', + join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n"; +} + 1; } # ###########################################################################