mysql-mmm

Merge lp:~dage/mysql-mmm/fix-net-arp into lp:mysql-mmm

  1. fix-net-arp
  2. Merge into trunk-2.x
Proposed by David Beveridge
Status: Merged
Merged at revision: 148
Proposed branch: lp:~dage/mysql-mmm/fix-net-arp
Merge into: lp:mysql-mmm
Diff against target: 27 lines (+3/-3)
2 files modified
lib/Agent/Helpers.pm (+2/-2)
lib/Agent/Helpers/Network.pm (+1/-1)
To merge this branch: bzr merge lp:~dage/mysql-mmm/fix-net-arp
Reviewer Review Type Date Requested Status
David Beveridge Approve
Review via email: mp+345114@code.launchpad.net

Commit message

Fix #1766773 bug with newer Net::ARP version numbers

Description of the change

This bug was first reported on redhat bugzilla (and patched) some time ago.
https://bugzilla.redhat.com/show_bug.cgi?id=1169914

To post a comment you must log in.
Revision history for this message
David Beveridge (dage) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/Agent/Helpers.pm'
2--- lib/Agent/Helpers.pm 2010-03-09 11:22:37 +0000
3+++ lib/Agent/Helpers.pm 2018-05-04 20:12:46 +0000
4@@ -168,8 +168,8 @@
5 my $config_file = $main::agent->config_file;
6 $params = '' unless defined($params);
7
8- DEBUG "Executing $path $params";
9- my $res = `$path $config_file $params`;
10+ DEBUG "Executing $path $config_file $params";
11+ my $res = `$path $config_file $params 2>&1`;
12
13 unless ($return_all) {
14 my @lines = split /\n/, $res;
15
16=== modified file 'lib/Agent/Helpers/Network.pm'
17--- lib/Agent/Helpers/Network.pm 2010-02-05 17:27:32 +0000
18+++ lib/Agent/Helpers/Network.pm 2018-05-04 20:12:46 +0000
19@@ -133,7 +133,7 @@
20
21 if ($OSNAME eq 'linux' || $OSNAME eq 'freebsd') {
22 my $mac = '';
23- if ($Net::ARP::VERSION < 1.0) {
24+ if ($Net::ARP::VERSION =~ /^0/) { # VERSION < 1.0 check that even works for 1.0.8, etc.
25 Net::ARP::get_mac($if, $mac);
26 }
27 else {

Subscribers

People subscribed via source and target branches