Merge lp:~percona-toolkit-dev/percona-toolkit/fix-pt-agent-lwp-bug-1226721 into lp:~percona-toolkit-dev/percona-toolkit/release-2.2.5

Proposed by Daniel Nichter
Status: Merged
Approved by: Daniel Nichter
Approved revision: 590
Merged at revision: 592
Proposed branch: lp:~percona-toolkit-dev/percona-toolkit/fix-pt-agent-lwp-bug-1226721
Merge into: lp:~percona-toolkit-dev/percona-toolkit/release-2.2.5
Diff against target: 37 lines (+13/-1)
1 file modified
bin/pt-agent (+13/-1)
To merge this branch: bzr merge lp:~percona-toolkit-dev/percona-toolkit/fix-pt-agent-lwp-bug-1226721
Reviewer Review Type Date Requested Status
Daniel Nichter Approve
Review via email: mp+186117@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Nichter (daniel-nichter) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/pt-agent'
--- bin/pt-agent 2013-08-08 19:28:36 +0000
+++ bin/pt-agent 2013-09-17 17:46:05 +0000
@@ -5428,6 +5428,12 @@
5428 $logger->fatal("Missing required Perl modules");5428 $logger->fatal("Missing required Perl modules");
5429 }5429 }
54305430
5431 # Check that LWP is new enough
5432 # https://bugs.launchpad.net/percona-toolkit/+bug/1226721
5433 if ( $LWP::VERSION < '5.813' ) {
5434 die "Perl module LWP v5.813 or newer is required; v$LWP::VERSION is installed. Please upgrade LWP on this server.\n"
5435 }
5436
5431 # ########################################################################5437 # ########################################################################
5432 # Nothing works without an API key.5438 # Nothing works without an API key.
5433 # ########################################################################5439 # ########################################################################
@@ -8341,6 +8347,12 @@
8341 $next_step->();8347 $next_step->();
8342 exit 1 if missing_perl_module_deps();8348 exit 1 if missing_perl_module_deps();
83438349
8350 # Check that LWP is new enough
8351 # https://bugs.launchpad.net/percona-toolkit/+bug/1226721
8352 if ( $LWP::VERSION < '5.813' ) {
8353 die "LWP v5.813 or newer is required; v$LWP::VERSION is installed. Please upgrade LWP on this server and try again.\n"
8354 }
8355
8344 # Check for crontab8356 # Check for crontab
8345 $next_step->();8357 $next_step->();
8346 my $crontab = `which crontab 2>/dev/null`;8358 my $crontab = `which crontab 2>/dev/null`;
@@ -9310,7 +9322,7 @@
93109322
9311=item * JSON Perl module9323=item * JSON Perl module
93129324
9313=item * LWP Perl module9325=item * LWP (>= v5.813) Perl module
93149326
9315=item * IO::Socket::SSL Perl module9327=item * IO::Socket::SSL Perl module
93169328

Subscribers

People subscribed via source and target branches

to all changes: