Merge lp:~nobuto/charms/precise/mysql/no-ppa into lp:charms/mysql

[Nobuto Murata]

mysql charm adds PPA by default. but it's not needed for precise or later releases.

In this branch, add PPA only if releases are older than precise.

[Clint Byrum (clint-fewbar)]

Hi Nobuto, thanks for the change!

Since this branch is precise and later only (it won't be used on oneiric or natty), we can just remove the conditional logic and remove all of that code, no need to test w/ lsb_release.

Please change back to 'Needs Review' after you have fixed that.

review: Needs Fixing

[Nobuto Murata (nobuto)]

Hi Clint,

I have fixed my branch. Thanks!

[Clint Byrum (clint-fewbar)]

Awesome! +1

review: Approve

=== modified file 'hooks/install'
--- hooks/install	2012-08-22 18:54:37 +0000
+++ hooks/install	2012-09-06 00:46:19 +0000
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-add-apt-repository -y ppa:charmers/charm-helpers
 apt-get update
 apt-get install -y debconf-utils python-mysqldb uuid augeas-tools augeas-lenses pwgen dnsutils charm-helper-sh || exit 1
 

=== modified file 'revision'
--- revision	2012-08-22 18:48:34 +0000
+++ revision	2012-09-06 00:46:19 +0000
@@ -1,1 +1,1 @@
-148
+149