Merge lp:~kirkland/maas/1310844 into lp:~maas-committers/maas/trunk

Proposed by Dustin Kirkland 
Status: Merged
Merged at revision: 2288
Proposed branch: lp:~kirkland/maas/1310844
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
src/provisioningserver/utils/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~kirkland/maas/1310844
Reviewer Review Type Date Requested Status
MAAS Maintainers Pending
Review via email: mp+216647@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Graham Binns (gmb) wrote :

Hi Dustin,

Thanks for this. It needs a regression test; if you don't have time to add one I'll happily take care of it.

LMK,

gmb

Revision history for this message
Dustin Kirkland  (kirkland) wrote :

That would be great, Graham, if you could do it. Point me to it
afterward, and I'll gladly learn from it.

Cheers,

:-Dustin

On Tue, Apr 22, 2014 at 3:41 AM, Graham Binns
<email address hidden> wrote:
> Hi Dustin,
>
> Thanks for this. It needs a regression test; if you don't have time to add one I'll happily take care of it.
>
> LMK,
>
> gmb
> --
> https://code.launchpad.net/~kirkland/maas/1310844/+merge/216647
> You are the owner of lp:~kirkland/maas/1310844.

Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

Looks like the fix is already in the code, but no test... I just wrote one: https://code.launchpad.net/~jtv/maas/test-1310844/+merge/217006

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/utils/__init__.py'
2--- src/provisioningserver/utils/__init__.py 2014-03-28 15:23:38 +0000
3+++ src/provisioningserver/utils/__init__.py 2014-04-21 23:23:02 +0000
4@@ -819,7 +819,7 @@
5
6 output = call_capture_and_check(['arp', '-n']).split('\n')
7
8- for line in output:
9+ for line in sorted(output):
10 columns = line.split()
11 if len(columns) == 5 and columns[2] == mac:
12 return columns[0]