Merge lp:~jose/charms/precise/sbuild/1297637-fix into lp:charms/sbuild

[José Antonio Rey]

Fixed config.yaml and edited config-changed accordingly, reformatted README to Markdown

Charmworld reports the following errors:

    err: config.yaml: mk-sbuild.sources does not conform to naming pattern
    err: config.yaml: mk-sbuild.rc does not conform to naming pattern
    warn: Metadata is missing categories.
    warn: No icon.svg file.
    warn: config.yaml: option salt has unknown keys: validator
    warn: config.yaml: option mk-sbuild.sources does not have the keys: description
    warn: config.yaml: option mk-sbuild.sources has unknown keys: descption

Fixed them all except icon adding and reformatted README to be in Markdown

[lp:~jose/charms/precise/sbuild/1297637-fix]

8. By José Antonio Rey on 2014-04-08

Removed icon as it didn't comply with Charm Store policies

[Charles Butler (lazypower)]

Thanks Jose!

LGTM

=== removed file 'README'
--- README	2012-06-18 16:15:49 +0000
+++ README	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-This charm is designed to set up sbuild for a bug-squashing party.
-
-It _enables_ SSH passwords (after locking the ubuntu user's password), so
-beware.
-
-Hacks to run remotely:
-    "hooks/wipe" for destroying all chroots.
-    "hooks/report $EXTERNAL_HOSTNAME" for reporting the state of a machine.
-
-
-For example, to throw a bug-squashing party:
-
-...configure juju and sbuild.yaml for the password salt, distros, etc...
-
-juju boostrap
-...time passes...
-
-juju deploy --config sbuild.yaml --repository /scratch/ubuntu/vcs/juju/examples local:sbuild builder-bsp
-juju add-unit builder-bsp
-juju add-unit builder-bsp
-juju add-unit builder-bsp
-...
-
-...time passes...
-
-# Dump reports printable on little slips of paper to hand out at the party:
-./slips builder-bsp | mpage -1 | lp

=== added file 'README.md'
--- README.md	1970-01-01 00:00:00 +0000
+++ README.md	2014-04-08 01:07:49 +0000
@@ -0,0 +1,28 @@
+This charm is designed to set up sbuild for a bug-squashing party.
+
+It _enables_ SSH passwords (after locking the ubuntu user's password), so
+beware.
+
+Hacks to run remotely:
+
+    hooks/wipe
+
+for destroying all chroots.
+
+    hooks/report $EXTERNAL_HOSTNAME
+
+for reporting the state of a machine.
+
+# Usage
+
+For example, to throw a bug-squashing party, configure juju and sbuild.yaml for
+the password salt, distros, etc, then execute:
+
+    juju boostrap
+    juju deploy --config sbuild.yaml --repository /scratch/ubuntu/vcs/juju/examples local:sbuild builder-bsp
+    juju add-unit builder-bsp
+    juju add-unit builder-bsp
+    juju add-unit builder-bsp
+
+    # Dump reports printable on little slips of paper to hand out at the party:
+    ./slips builder-bsp | mpage -1 | lp

=== modified file 'config.yaml'
--- config.yaml	2012-11-20 10:15:37 +0000
+++ config.yaml	2014-04-08 01:07:49 +0000
@@ -11,7 +11,6 @@
         type: string
         default: unset
         description: Salt for generating builder accounts.
-        validator: '.{8,}'
     btsparty:
         type: boolean
         default: yes
@@ -24,11 +23,11 @@
         type: string
         default: ""
         description: Comma-separated list of extra packages to install in chroots.
-    mk-sbuild.rc:
+    mksbuildrc:
         type: string
         default: ""
         description: Contents of mk-sbuild.rc. See $ man mk-sbuild.
-    mk-sbuild.sources:
+    mksbuildsources:
         type: string
         default: ""
-        descption: Conternts of ~/.mk-sbuild.sources. See $ man mk-sbuild.
+        description: Conternts of ~/.mk-sbuild.sources. See $ man mk-sbuild.

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2012-11-20 10:15:37 +0000
+++ hooks/config-changed	2014-04-08 01:07:49 +0000
@@ -13,18 +13,18 @@
 
 CHROOTS=$(config-get chroots)
 PACKAGES=$(config-get packages)
-MK_SBUILD_RC=$(config-get mk-sbuild.rc)
-MK_SBUILD_SOURCES=$(config-get mk-sbuild.sources)
+MK_SBUILD_RC=$(config-get mksbuildrc)
+MK_SBUILD_SOURCES=$(config-get mksbuildsources)
 HOMEDIR=$(getent passwd $USERNAME | cut -d: -f 6)
 if [ -n "$PACKAGES" ]; then
     PACKAGES="--debootstrap-include=$PACKAGES"
 fi
 if [ -n "$MK_SBUILD_RC" ]; then
-    config-get mk-sbuild.rc -o $HOMEDIR/.mk-sbuild.rc
+    config-get mksbuildrc -o $HOMEDIR/.mk-sbuild.rc
     chown $USERNAME $HOMEDIR/.mk-sbuild.rc
 fi
 if [ -n "$MK_SBUILD_SOURCES" ]; then
-    config-get mk-sbuild.rc -o $HOMEDIR/.mk-sbuild.sources
+    config-get mksbuildrc -o $HOMEDIR/.mk-sbuild.sources
     chown $USERNAME $HOMEDIR/.mk-sbuild.sources
 fi
 

=== modified file 'metadata.yaml'
--- metadata.yaml	2012-06-18 16:27:32 +0000
+++ metadata.yaml	2014-04-08 01:07:49 +0000
@@ -3,6 +3,8 @@
 description: |
     Installs an sbuild and schroot environment for package building.
 maintainer: Kees Cook <[e-mail]>
+categories:
+  - misc
 provides:
   package-builder:
     interface: sbuild