summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorMarkus Holtermann <info@markusholtermann.eu>2015-09-12 10:23:10 +1000
committerMarkus Holtermann <info@markusholtermann.eu>2015-09-12 10:38:15 +1000
commita3c01b0dd8060f00a5ffd2589a776b4f618af6d9 (patch)
treef0faffd7829ba92f204e775f4a11e974191a34b0 /django
parentec704371e301c5450dd5fc012a30424a8f47b99b (diff)
Fixed #24919 -- Allowed disabling of migrations on a per app basis
Diffstat (limited to 'django')
-rw-r--r--django/db/migrations/loader.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/django/db/migrations/loader.py b/django/db/migrations/loader.py
index a8f4be47b9..93aa8e61f7 100644
--- a/django/db/migrations/loader.py
+++ b/django/db/migrations/loader.py
@@ -66,6 +66,9 @@ class MigrationLoader(object):
for app_config in apps.get_app_configs():
# Get the migrations module directory
module_name = self.migrations_module(app_config.label)
+ if module_name is None:
+ self.unmigrated_apps.add(app_config.label)
+ continue
was_loaded = module_name in sys.modules
try:
module = import_module(module_name)