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

[Stuart Bishop]

Minor cleanups

[Dave Cheney (dave-cheney)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2013-10-03 12:14:03 +0000
+++ config.yaml	2013-10-11 12:58:25 +0000
@@ -289,7 +289,8 @@
     description: >
       YAML map as e.g. "{ postgres/0: vol-0000010, postgres/1: vol-0000016 }".
       Service units will raise a "configure-error" condition if no volume-map
-      value is set for it - it's expected a human to set it properly to resolve it.
+      value is set for it - it's expected a human to set it properly to
+      resolve it.
   volume-dev-regexp:
     type: string
     default: "/dev/vd[b-z]"
@@ -322,7 +323,9 @@
     default: ""
     type: string
     description: |
-        Extra archives to add with add-apt-repository(1).
+        Extra archives to add, space separated. Supports ppa:, http:, cloud:
+        URIs, as well as other schemes and keywords supported by
+        charmhelpers.fetch.add_source() such as "proposed".
   advisory_lock_restart_key:
     default: 765
     type: int
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-10-10 10:51:12 +0000
+++ hooks/hooks.py	2013-10-11 12:58:25 +0000
@@ -1247,11 +1247,11 @@
         repos_added = False
         for repo in extra_repos.split():
             if repo not in extra_repos_added:
-                run("add-apt-repository --yes '{}'".format(repo))
+                fetch.add_source(repo)
                 extra_repos_added.add(repo)
                 repos_added = True
         if repos_added:
-            host.apt_update(fatal=True)
+            fetch.apt_update(fatal=True)
             local_state.save()