Merge lp:~verterok/charms/trusty/logstash/disable-install-on-config-change into lp:~tanuki/charms/trusty/logstash/trunk

Proposed by Guillermo Gonzalez on 2015-08-04
Status: Merged
Merged at revision: 49
Proposed branch: lp:~verterok/charms/trusty/logstash/disable-install-on-config-change
Merge into: lp:~tanuki/charms/trusty/logstash/trunk
Diff against target: 14 lines (+3/-1)
1 file modified
hooks/config-changed (+3/-1)
To merge this branch: bzr merge lp:~verterok/charms/trusty/logstash/disable-install-on-config-change
Reviewer Review Type Date Requested Status
Celso Providelo (community) 2015-08-04 Approve on 2015-08-04
Review via email: mp+266880@code.launchpad.net

Commit message

Disable call of install hook from config-changed, as it fails if the tarball was already installed/extracted

Description of the change

Disable call of install hook from config-changed, as it fails if the tarball was already installed/extracted

To post a comment you must log in.
Celso Providelo (cprov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/config-changed'
2--- hooks/config-changed 2015-06-30 16:42:53 +0000
3+++ hooks/config-changed 2015-08-04 14:12:41 +0000
4@@ -41,7 +41,9 @@
5 hookenv.open_port(5959, protocol='UDP')
6
7 # The install hook is idempotent, so re-run it.
8- subprocess.check_output(shlex.split('hooks/install'))
9+ # XXX: no, it's not idempotent. it fails if the tarball was already
10+ # extracted
11+ # subprocess.check_output(shlex.split('hooks/install'))
12
13
14 def copy_config():

Subscribers

People subscribed via source and target branches