Ubuntu Mirror Charm

Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:default-v6-2 into ubuntu-mirror-charm:master

  1. Git
  2. lp:~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm
  3. default-v6-2
  4. Merge into master
Proposed by Paul Collins
Status: Merged
Approved by: Haw Loeung
Approved revision: a5d1d5ce597502d7b7b838d67e97f02f22b2004b
Merged at revision: a97fbd9e0ba2f421611d1a8f6034ab1fd2e1af20
Proposed branch: ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:default-v6-2
Merge into: ubuntu-mirror-charm:master
Diff against target: 13 lines (+1/-1)
1 file modified
hooks/hooks.py (+1/-1)
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Canonical IS Reviewers Pending
Review via email: mp+381483@code.launchpad.net

Commit message

address families are bare ints in Python 2 (ugh)

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Haw Loeung (hloeung) wrote :

LGTM

review: Approve (+1)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision a97fbd9e0ba2f421611d1a8f6034ab1fd2e1af20

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/hooks/hooks.py b/hooks/hooks.py
2index f5b932e..dca0b6c 100755
3--- a/hooks/hooks.py
4+++ b/hooks/hooks.py
5@@ -94,7 +94,7 @@ def get_default_address(af):
6 s.connect(GET_DEFAULT_ADDRESS_DESTINATIONS[af])
7 return s.getsockname()[0]
8 except Exception as e:
9- log("CHARM: Unable to determine local {} address: {}".format(af.name, str(e)))
10+ log("CHARM: Unable to determine local address for address family {}: {}".format(af, str(e)))
11 return None
12 finally:
13 s.close()

Subscribers

People subscribed via source and target branches