MAAS

Merge lp:~andreserl/maas/packaging_python_django16_vivid into lp:~maas-maintainers/maas/packaging

  1. packaging_python_django16_vivid
  2. Merge into packaging
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 368
Merged at revision: 367
Proposed branch: lp:~andreserl/maas/packaging_python_django16_vivid
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 54 lines (+11/-2)
4 files modified
debian/changelog (+1/-1)
debian/control (+2/-1)
debian/extras/maas-region-admin (+6/-0)
debian/maas-region-controller-min.maas-regiond.service (+2/-0)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_python_django16_vivid
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Raphaël Badin (community) Approve
Review via email: mp+253750@code.launchpad.net

Commit message

Add support for the use of python-django16 instead of python-django (1.7) as it breaks MAAS.

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) wrote :

Looks good (although this isn't up for review yet, we've tested it successfully on Friday.)

review: Approve
Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-03-21 00:27:21 +0000
3+++ debian/changelog 2015-03-23 15:03:13 +0000
4@@ -1,6 +1,6 @@
5 maas (1.8.0~alpha9+bzr3692-0ubuntu1) UNRELEASED; urgency=medium
6
7- * UNRELEASED
8+ * Make sure MAAS works with python-django16 in vivid.
9
10 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 20 Mar 2015 20:27:02 -0400
11
12
13=== modified file 'debian/control'
14--- debian/control 2015-03-18 18:41:50 +0000
15+++ debian/control 2015-03-23 15:03:13 +0000
16@@ -57,7 +57,8 @@
17 maas-common (= ${binary:Version}),
18 maas-proxy (= ${binary:Version}),
19 python-bson,
20- python-django (>= 1.4),
21+ python-django16 | python-django (<< 1.7),
22+ python-django,
23 python-django-maas (= ${binary:Version}),
24 python-django-piston,
25 python-django-south,
26
27=== modified file 'debian/extras/maas-region-admin'
28--- debian/extras/maas-region-admin 2014-09-09 10:30:23 +0000
29+++ debian/extras/maas-region-admin 2015-03-23 15:03:13 +0000
30@@ -10,6 +10,12 @@
31 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "maas.settings")
32 sys.path.append('/usr/share/maas')
33
34+# Use Django 1.6 if the python-django16 package is installed: this is
35+# to get MAAS to work on vivid: vivid ships with Django 1.7 by default
36+# and MAAS isn't yet compatible with Django 1.7.
37+if os.path.exists('/usr/lib/django16'):
38+ sys.path.insert(0, '/usr/lib/django16')
39+
40 from django.core import management
41
42 if __name__ == "__main__":
43
44=== modified file 'debian/maas-region-controller-min.maas-regiond.service'
45--- debian/maas-region-controller-min.maas-regiond.service 2015-03-17 17:41:24 +0000
46+++ debian/maas-region-controller-min.maas-regiond.service 2015-03-23 15:03:13 +0000
47@@ -10,6 +10,8 @@
48 Environment="DJANGO_SETTINGS_MODULE=maas.settings"
49 Environment="PYTHONPATH=/usr/share/maas"
50 ExecStart=/bin/sh -ec '\
51+ if [ -d "/usr/lib/django16" ]; then DJANGO_SETTINGS_MODULE=maas.settings; \
52+ PYTHONPATH="/usr/share/maas:/usr/lib/django16"; fi; \
53 exec /usr/bin/authbind --deep /usr/bin/twistd \
54 --nodaemon --pidfile= maas-regiond > /var/log/maas/regiond.log 2>&1'
55

Subscribers

People subscribed via source and target branches

to all changes: