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
1=== modified file 'bin/pt-agent'
2--- bin/pt-agent 2013-08-08 19:28:36 +0000
3+++ bin/pt-agent 2013-09-17 17:46:05 +0000
4@@ -5428,6 +5428,12 @@
5 $logger->fatal("Missing required Perl modules");
6 }
7
8+ # Check that LWP is new enough
9+ # https://bugs.launchpad.net/percona-toolkit/+bug/1226721
10+ if ( $LWP::VERSION < '5.813' ) {
11+ die "Perl module LWP v5.813 or newer is required; v$LWP::VERSION is installed. Please upgrade LWP on this server.\n"
12+ }
13+
14 # ########################################################################
15 # Nothing works without an API key.
16 # ########################################################################
17@@ -8341,6 +8347,12 @@
18 $next_step->();
19 exit 1 if missing_perl_module_deps();
20
21+ # Check that LWP is new enough
22+ # https://bugs.launchpad.net/percona-toolkit/+bug/1226721
23+ if ( $LWP::VERSION < '5.813' ) {
24+ die "LWP v5.813 or newer is required; v$LWP::VERSION is installed. Please upgrade LWP on this server and try again.\n"
25+ }
26+
27 # Check for crontab
28 $next_step->();
29 my $crontab = `which crontab 2>/dev/null`;
30@@ -9310,7 +9322,7 @@
31
32 =item * JSON Perl module
33
34-=item * LWP Perl module
35+=item * LWP (>= v5.813) Perl module
36
37 =item * IO::Socket::SSL Perl module
38

Subscribers

People subscribed via source and target branches

to all changes: