percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-11 13:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check for ../../.bzr for when a tool is ran as a module in a test.

Browse Source
This commit is contained in:
Daniel Nichter
2013-02-22 08:00:55 -07:00
parent 550bb3887a
commit b286da993f
20 changed files with 62 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/pt-archiver
View File

@@ -4741,8 +4741,10 @@ sub version_check {
my $instances = $args{instances} || []; my $instances = $args{instances} || [];
my $instances_to_check; my $instances_to_check;
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }

4
bin/pt-config-diff
View File

@@ -4415,8 +4415,10 @@ sub version_check {
my $instances = $args{instances} || []; my $instances = $args{instances} || [];
my $instances_to_check; my $instances_to_check;
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }

4
bin/pt-deadlock-logger
View File

@@ -3331,8 +3331,10 @@ sub version_check {
my $instances = $args{instances} || []; my $instances = $args{instances} || [];
my $instances_to_check; my $instances_to_check;
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }

4
bin/pt-diskstats
View File

@@ -4226,8 +4226,10 @@ sub version_check {
my $instances = $args{instances} || []; my $instances = $args{instances} || [];
my $instances_to_check; my $instances_to_check;
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }

4
bin/pt-duplicate-key-checker
View File

@@ -4087,8 +4087,10 @@ sub version_check {
my $instances = $args{instances} || []; my $instances = $args{instances} || [];
my $instances_to_check; my $instances_to_check;
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }

4
bin/pt-find
View File

@@ -2899,8 +2899,10 @@ sub version_check {
my $instances = $args{instances} || []; my $instances = $args{instances} || [];
my $instances_to_check; my $instances_to_check;
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }

4
bin/pt-fk-error-logger
View File

@@ -2841,8 +2841,10 @@ sub version_check {
my $instances = $args{instances} || []; my $instances = $args{instances} || [];
my $instances_to_check; my $instances_to_check;
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }

4
bin/pt-heartbeat
View File

@@ -4067,8 +4067,10 @@ sub version_check {
my $instances = $args{instances} || []; my $instances = $args{instances} || [];
my $instances_to_check; my $instances_to_check;
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }

4
bin/pt-index-usage
View File

@@ -5542,8 +5542,10 @@ sub version_check {
my $instances = $args{instances} || []; my $instances = $args{instances} || [];
my $instances_to_check; my $instances_to_check;
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }

4
bin/pt-kill
View File

@@ -5764,8 +5764,10 @@ sub version_check {
my $instances = $args{instances} || []; my $instances = $args{instances} || [];
my $instances_to_check; my $instances_to_check;
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }

4
bin/pt-online-schema-change
View File

@@ -7214,8 +7214,10 @@ sub version_check {
my $instances = $args{instances} || []; my $instances = $args{instances} || [];
my $instances_to_check; my $instances_to_check;
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }

4
bin/pt-query-advisor
View File

@@ -7497,8 +7497,10 @@ sub version_check {
my $instances = $args{instances} || []; my $instances = $args{instances} || [];
my $instances_to_check; my $instances_to_check;
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }

4
bin/pt-query-digest
View File

@@ -13126,8 +13126,10 @@ sub version_check {
my $instances = $args{instances} || []; my $instances = $args{instances} || [];
my $instances_to_check; my $instances_to_check;
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }

4
bin/pt-slave-delay
View File

@@ -3442,8 +3442,10 @@ sub version_check {
my $instances = $args{instances} || []; my $instances = $args{instances} || [];
my $instances_to_check; my $instances_to_check;
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }

4
bin/pt-slave-restart
View File

@@ -4066,8 +4066,10 @@ sub version_check {
my $instances = $args{instances} || []; my $instances = $args{instances} || [];
my $instances_to_check; my $instances_to_check;
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }

4
bin/pt-table-checksum
View File

@@ -780,8 +780,10 @@ sub version_check {
my $instances = $args{instances} || []; my $instances = $args{instances} || [];
my $instances_to_check; my $instances_to_check;
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }

4
bin/pt-table-sync
View File

@@ -8904,8 +8904,10 @@ sub version_check {
my $instances = $args{instances} || []; my $instances = $args{instances} || [];
my $instances_to_check; my $instances_to_check;
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }

4
bin/pt-upgrade
View File

@@ -11723,8 +11723,10 @@ sub version_check {
my $instances = $args{instances} || []; my $instances = $args{instances} || [];
my $instances_to_check; my $instances_to_check;
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }

4
bin/pt-variable-advisor
View File

@@ -4349,8 +4349,10 @@ sub version_check {
my $instances = $args{instances} || []; my $instances = $args{instances} || [];
my $instances_to_check; my $instances_to_check;
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }

6
lib/VersionCheck.pm
View File

@@ -106,8 +106,12 @@ sub version_check {
# However, we do not want dev and testing to v-c, so even though this # However, we do not want dev and testing to v-c, so even though this
# sub is called, force should be false because $o->got('version-check') # sub is called, force should be false because $o->got('version-check')
# is false, then check for a .bzr dir which indicates dev or testing. # is false, then check for a .bzr dir which indicates dev or testing.
# ../.bzr is when a tool is ran from /bin/; ../../.bzr is when a tool
# is ran as a module from /t/<tool>/.
PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
if ( !$args{force} ) { if ( !$args{force} ) {
if ( $FindBin::Bin && -d "$FindBin::Bin/../.bzr" ) { if ( $FindBin::Bin
&& (-d "$FindBin::Bin/../.bzr" || -d "$FindBin::Bin/../../.bzr") ) {
PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check"); PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
return; return;
} }