diff options
| author | Andrew Godwin <andrew@aeracode.org> | 2014-04-30 15:11:29 -0700 |
|---|---|---|
| committer | Andrew Godwin <andrew@aeracode.org> | 2014-04-30 15:12:18 -0700 |
| commit | 6ca53678699a4eececa3b178f0f7e051956bf580 (patch) | |
| tree | 80d8adc070e906a2c598e4c511bec4a477be369c /django | |
| parent | c0d5521e69397a0f1d089d662d3b00dc5bdafa66 (diff) | |
[1.7.x] Cleanup failing test w/contenttypes and remove useless graph load
Diffstat (limited to 'django')
| -rw-r--r-- | django/core/management/commands/makemigrations.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/django/core/management/commands/makemigrations.py b/django/core/management/commands/makemigrations.py index d9d7a05b6c..d8aada94da 100644 --- a/django/core/management/commands/makemigrations.py +++ b/django/core/management/commands/makemigrations.py @@ -53,8 +53,7 @@ class Command(BaseCommand): # Load the current graph state. Takes a connection, but it's not used # (makemigrations doesn't look at the database state). # Also make sure the graph is built without unmigrated apps shoehorned in. - loader = MigrationLoader(connections[DEFAULT_DB_ALIAS], load=False) - loader.build_graph() + loader = MigrationLoader(connections[DEFAULT_DB_ALIAS]) # Before anything else, see if there's conflicting apps and drop out # hard if there are any and they don't want to merge |