Merge lp:~thedac/charms/precise/errors/set-django-version into lp:~daisy-pluckers/charms/precise/errors/trunk

[David Ames]

Set the specific python-django version of the package and hold it at that version

[Brian Murray (brian-murray)]

review: Approve

[lp:~thedac/charms/precise/errors/set-django-version]

37. By David Ames on 2014-03-19

Fix typo

=== modified file 'config.yaml'
--- config.yaml	2014-03-07 20:03:17 +0000
+++ config.yaml	2014-03-19 17:17:04 +0000
@@ -62,6 +62,12 @@
       type: string
       default: 'ppa:daisy-pluckers/daisy-seeds'
       description: The location for the daisy-dependencies package.
+  django_repository:
+      type: string
+      description: The apt repository for python-django
+  django_version:
+      type: string
+      description: The package version of python-django to install and hold
   openid_trust_root:
       type: string
       default: 'http://errors.staging.ubuntu.com/'
 
=== modified file 'hooks/common'
--- hooks/common	2014-03-17 16:09:32 +0000
+++ hooks/common	2014-03-19 17:17:04 +0000
@@ -25,6 +25,8 @@
 ERROR_CODE_DIRS="$(config-get error_code_dirs)"
 REGION="$(config-get region)"
 NRPE_URL_CHECK_PARAMS="$(config-get nrpe_url_check_params)"
+DJANGO_REPOSITORY="$(config-get django_repository)"
+DJANGO_VERSION="$(config-get django_version)"
 
 save_setting () {
     key="$1"
 
=== modified file 'hooks/install'
--- hooks/install	2013-05-03 11:02:27 +0000
+++ hooks/install	2014-03-19 17:17:04 +0000
@@ -17,7 +17,14 @@
 fi
 
 add-apt-repository "$(config-get repository)"
+if [ -n "$DJANGO_REPOSITORY" ]; then
+    add-apt-repository "$DJANGO_REPOSITORY"
+fi
 apt-get update
+if [ -n "$DJANGO_VERSION" ]; then
+    DEBCONF_FRONTEND=noninteractive apt-get install -y python-django=${DJANGO_VERSION}
+    echo "python-django hold" | dpkg --set-selections
+fi
 DEBCONF_FRONTEND=noninteractive apt-get install -y errors-dependencies
 
 # Create groups