Merge lp://qastaging/~thumper/charms/precise/python-django/tweaks into lp://qastaging/charms/python-django
Proposed by
Tim Penhey
| Status: | Merged |
|---|---|
| Merged at revision: | 35 |
| Proposed branch: | lp://qastaging/~thumper/charms/precise/python-django/tweaks |
| Merge into: | lp://qastaging/charms/python-django |
| Diff against target: |
159 lines (+36/-40) 3 files modified
hooks/hooks.py (+32/-38) templates/conf_injection.tmpl (+2/-1) templates/urls_injection.tmpl (+2/-1) |
| To merge this branch: | bzr merge lp://qastaging/~thumper/charms/precise/python-django/tweaks |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
Extract out a method for the database sync calls.
This means that when the charm is updated to support Django 1.7, there is only one place that needs to deal with it. The existing behaviour has been kept, even though it is a little weird in one place.
Also the injection templates for urls and settings is updated to make the execution call a little more helpful if there are errors as filenames are shown along-side the code.
To post a comment you must log in.
Revision history for this message
| Charles Butler (lazypower) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
my cursory glance on this is good, but I cannot verify this didn't produce test weirdness. Waiting on the automated testing infra to kick this off and give us some results; as well as let Patrick have some time to look this over as he just landed the pure-python branch earlier today.
Thanks for the submission Thumper, awesome to see you're submitting charm patches now.