diff options
| author | Chris Church <chris@ninemoreminutes.com> | 2015-07-21 14:42:48 -0400 |
|---|---|---|
| committer | Chris Church <chris@ninemoreminutes.com> | 2015-07-21 14:42:48 -0400 |
| commit | 9e47219b9617ae681b13b30bb5f786824999cc8c (patch) | |
| tree | 626e3af86811d0194ac2c3bb81387c0b765ba83d /web_infrastructure | |
| parent | 55bc9e8fb1c8e1a50418d8471a72f049e74fd06d (diff) | |
| parent | 3c605d4aba68e0170d6779117e1d326790291059 (diff) | |
| download | ansible-modules-core-9e47219b9617ae681b13b30bb5f786824999cc8c.tar.gz | |
Merge pull request #1153 from Ernest0x/patch-3
make migrate command idempotent with django built-in migrations
Diffstat (limited to 'web_infrastructure')
| -rw-r--r-- | web_infrastructure/django_manage.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web_infrastructure/django_manage.py b/web_infrastructure/django_manage.py index 2637446d..b3cabfe0 100644 --- a/web_infrastructure/django_manage.py +++ b/web_infrastructure/django_manage.py @@ -90,7 +90,7 @@ notes: - I(virtualenv) (U(http://www.virtualenv.org)) must be installed on the remote host if the virtualenv parameter is specified. - This module will create a virtualenv if the virtualenv parameter is specified and a virtualenv does not already exist at the given location. - This module assumes English error messages for the 'createcachetable' command to detect table existence, unfortunately. - - To be able to use the migrate command, you must have south installed and added as an app in your settings + - To be able to use the migrate command with django versions < 1.7, you must have south installed and added as an app in your settings - To be able to use the collectstatic command, you must have enabled staticfiles in your settings requirements: [ "virtualenv", "django" ] author: "Scott Anderson (@tastychutney)" @@ -163,7 +163,7 @@ def syncdb_filter_output(line): return ("Creating table " in line) or ("Installed" in line and "Installed 0 object" not in line) def migrate_filter_output(line): - return ("Migrating forwards " in line) or ("Installed" in line and "Installed 0 object" not in line) + return ("Migrating forwards " in line) or ("Installed" in line and "Installed 0 object" not in line) or ("Applying" in line) def collectstatic_filter_output(line): return "0 static files" not in line |