Merge ~sajoupa/charm-telegraf:extra-plugins-snap into charm-telegraf:master

Proposed by Laurent Sesques
Status: Merged
Approved by: James Hebden
Approved revision: c9b21cd9f23e7056dfeea70e46d6fdc2181bd590
Merged at revision: 974b863447d3f365f354ac22bd4ca274625e3e3a
Proposed branch: ~sajoupa/charm-telegraf:extra-plugins-snap
Merge into: charm-telegraf:master
Diff against target: 12 lines (+1/-0)
1 file modified
src/reactive/telegraf.py (+1/-0)
Reviewer Review Type Date Requested Status
James Hebden (community) Approve
Haw Loeung +1 Approve
Review via email: mp+393386@code.launchpad.net

Commit message

make sure that extra_plugins config gets written after changing install_method

To post a comment you must log in.
Revision history for this message
Laurent Sesques (sajoupa) wrote :

Passes `make test` successfully.

Revision history for this message
Canonical IS Mergebot (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
James Hebden (ec0) wrote :

Also LGTM, good pickup, thanks for the patch

review: Approve
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision 974b863447d3f365f354ac22bd4ca274625e3e3a

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/reactive/telegraf.py b/src/reactive/telegraf.py
2index e24b7eb..c0b9e0c 100644
3--- a/src/reactive/telegraf.py
4+++ b/src/reactive/telegraf.py
5@@ -664,6 +664,7 @@ def handle_config_changes():
6 or config.changed("install_sources") # noqa W503
7 ):
8 clear_flag("telegraf.installed")
9+ clear_flag("extra_plugins.configured")
10 clear_flag("telegraf.configured")
11 clear_flag("telegraf.apt.configured")
12 clear_flag("telegraf.snap.configured")

Subscribers

People subscribed via source and target branches