Merge lp:~stub/charms/precise/postgresql/cleanups into lp:charms/postgresql

Proposed by Stuart Bishop
Status: Merged
Merged at revision: 70
Proposed branch: lp:~stub/charms/precise/postgresql/cleanups
Merge into: lp:charms/postgresql
Prerequisite: lp:~stub/charms/precise/postgresql/charm-helpers
Diff against target: 40 lines (+7/-4)
2 files modified
config.yaml (+5/-2)
hooks/hooks.py (+2/-2)
To merge this branch: bzr merge lp:~stub/charms/precise/postgresql/cleanups
Reviewer Review Type Date Requested Status
Dave Cheney (community) Approve
Review via email: mp+190644@code.launchpad.net

Description of the change

Minor cleanups

To post a comment you must log in.
Revision history for this message
Dave Cheney (dave-cheney) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2013-10-03 12:14:03 +0000
3+++ config.yaml 2013-10-11 12:58:25 +0000
4@@ -289,7 +289,8 @@
5 description: >
6 YAML map as e.g. "{ postgres/0: vol-0000010, postgres/1: vol-0000016 }".
7 Service units will raise a "configure-error" condition if no volume-map
8- value is set for it - it's expected a human to set it properly to resolve it.
9+ value is set for it - it's expected a human to set it properly to
10+ resolve it.
11 volume-dev-regexp:
12 type: string
13 default: "/dev/vd[b-z]"
14@@ -322,7 +323,9 @@
15 default: ""
16 type: string
17 description: |
18- Extra archives to add with add-apt-repository(1).
19+ Extra archives to add, space separated. Supports ppa:, http:, cloud:
20+ URIs, as well as other schemes and keywords supported by
21+ charmhelpers.fetch.add_source() such as "proposed".
22 advisory_lock_restart_key:
23 default: 765
24 type: int
25
26=== modified file 'hooks/hooks.py'
27--- hooks/hooks.py 2013-10-10 10:51:12 +0000
28+++ hooks/hooks.py 2013-10-11 12:58:25 +0000
29@@ -1247,11 +1247,11 @@
30 repos_added = False
31 for repo in extra_repos.split():
32 if repo not in extra_repos_added:
33- run("add-apt-repository --yes '{}'".format(repo))
34+ fetch.add_source(repo)
35 extra_repos_added.add(repo)
36 repos_added = True
37 if repos_added:
38- host.apt_update(fatal=True)
39+ fetch.apt_update(fatal=True)
40 local_state.save()
41
42

Subscribers

People subscribed via source and target branches