Juju Charms Collection
mysql package

Merge lp:~marcoceppi/charms/trusty/mysql/lp1343812 into lp:charms/trusty/mysql

  1. Trusty Tahr (14.04)
  2. lp1343812
  3. Merge into trunk
Proposed by Marco Ceppi
Status: Merged
Merged at revision: 123
Proposed branch: lp:~marcoceppi/charms/trusty/mysql/lp1343812
Merge into: lp:charms/trusty/mysql
Diff against target: 22 lines (+3/-2)
1 file modified
hooks/config-changed (+3/-2)
To merge this branch: bzr merge lp:~marcoceppi/charms/trusty/mysql/lp1343812
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+227791@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Charles Butler (lazypower) wrote :

+1 LGTM - tested with an apt curtainproxy, and it retried as expected

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 2014-04-17 10:52:14 +0000
3+++ hooks/config-changed 2014-07-22 17:03:28 +0000
4@@ -12,7 +12,8 @@
5 from string import upper
6 from charmhelpers.fetch import (
7 add_source,
8- apt_update
9+ apt_update,
10+ apt_install
11 )
12
13
14@@ -115,7 +116,7 @@
15
16 if len(remove_pkgs):
17 check_call(['apt-get','-y','remove'] + remove_pkgs)
18-check_call(['apt-get','-y','install','-qq',package])
19+apt_install(package)
20
21 # smart-calc stuff in the configs
22 dataset_bytes = human_to_bytes(configs['dataset-size'])

Subscribers

People subscribed via source and target branches

to all changes: