Merge lp:~roadmr/capomastro/charm-force-python-django-version into lp:~ubuntuone-hackers/capomastro/charm

[Daniel Manrique]

Preinstall this version of django from trusty-security, since the one in
# trusty-updates is incompatible with capomastro. This is a low-cost hack; the
# correct solution would be for the capomastro deb to be fixed but that
# requires more work than we're willing to invest at this point.

Preinstall this version of django from trusty-security, since the one in
# trusty-updates is incompatible with capomastro. This is a low-cost hack; the
# correct solution would be for the capomastro deb to be fixed but that
# requires more work than we're willing to invest at this point.

[Daniel Manrique (roadmr)]

Self-approval since it's trivial

review: Approve

=== modified file 'hooks/install'
--- hooks/install	2015-03-31 16:21:23 +0000
+++ hooks/install	2017-01-20 21:14:20 +0000
@@ -15,6 +15,12 @@
 
 . inc/common
 
+# Preinstall this version of django from trusty-security, since the one in
+# trusty-updates is incompatible with capomastro. This is a low-cost hack; the
+# correct solution would be for the capomastro deb to be fixed but that
+# requires more work than we're willing to invest at this point.
+apt-get update && apt-get install python-django=1.6.1-2ubuntu0.16
+# Now install capomastro which should be happy with the python-django we preinstalled
 apt-add-repository --yes "${repository}" && apt-get update && apt-get install --assume-yes --force-yes capomastro
 
 # templates support in the charm