Merge lp:~thomir-deactivatedaccount/charm-haproxy/make-config-less-insane into lp:~ubuntuone-pqm-team/charm-haproxy/snap-store

Proposed by Thomi Richards on 2017-07-25
Status: Merged
Merged at revision: 112
Proposed branch: lp:~thomir-deactivatedaccount/charm-haproxy/make-config-less-insane
Merge into: lp:~ubuntuone-pqm-team/charm-haproxy/snap-store
Diff against target: 20 lines (+3/-3)
1 file modified
hooks/hooks.py (+3/-3)
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/charm-haproxy/make-config-less-insane
Reviewer Review Type Date Requested Status
William Grant code Approve on 2017-07-25
haproxy-team 2017-07-25 Pending
Review via email: mp+328011@code.launchpad.net

This proposal supersedes a proposal from 2017-07-25.

To post a comment you must log in.
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/hooks.py'
2--- hooks/hooks.py 2017-07-25 07:08:49 +0000
3+++ hooks/hooks.py 2017-07-25 07:57:42 +0000
4@@ -349,13 +349,13 @@
5 be_options.append(o)
6
7 # Filter provided service options into frontend-only and backend-only.
8- # XXX: The '{FE}' and '{BE}' feature is a local patch in this version
9+ # XXX: The '<FE>' and '<BE>' feature is a local patch in this version
10 # of the charm, and is not present in the upstream charm.
11 for option in service_options:
12 option = option.strip()
13- if option.startswith('{FE}'):
14+ if option.startswith('<FE>'):
15 fe_options.append(option[4:].strip())
16- elif option.startswith('{BE}'):
17+ elif option.startswith('<BE>'):
18 be_options.append(option[4:].strip())
19 else:
20 if any(map(option.startswith, frontend_only_options)):

Subscribers

People subscribed via source and target branches

to all changes: