Merge ~pwlars/checkbox/+git/support:fix-match-host-ip-for-apt-cache into ~checkbox-dev/checkbox/+git/support:master

Proposed by Paul Larson
Status: Merged
Approved by: Jonathan Cave
Approved revision: e6f89cd6f83e4dc97ac0879d38d072c4cdd58ae6
Merged at revision: 17beb11cc109cf97908f02fd1b7bd24889ce08ae
Proposed branch: ~pwlars/checkbox/+git/support:fix-match-host-ip-for-apt-cache
Merge into: ~checkbox-dev/checkbox/+git/support:master
Diff against target: 16 lines (+5/-1)
1 file modified
test-in-lxc.sh (+5/-1)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Jonathan Cave (community) Approve
Review via email: mp+395921@code.qastaging.launchpad.net

Description of the change

I added some comments around this too, but it looks like ip route get can sometimes include a uid field at the end, which was breaking awk. Instead of getting the ip address of the host, we were getting "113" which was the uid. This does the matching in a slightly different way that will work whether or not the uid exists in the output.

To post a comment you must log in.
Revision history for this message
Jonathan Cave (jocave) wrote :

Tried it in x/b/f containers and looks good

review: Approve
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

brilliant fix, +1

review: Approve

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches