From 2ab0ed7b2842fbb8bf36ee7df9949d10546d953d Mon Sep 17 00:00:00 2001 From: Florian Apolloner Date: Sun, 27 Jul 2014 13:23:16 +0200 Subject: [PATCH] Only warn about initial data if fixtures have been found. --- django/core/management/commands/loaddata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/core/management/commands/loaddata.py b/django/core/management/commands/loaddata.py index 0c739999b2..9cd5a232fd 100644 --- a/django/core/management/commands/loaddata.py +++ b/django/core/management/commands/loaddata.py @@ -220,7 +220,7 @@ class Command(BaseCommand): if fixture_name != 'initial_data' and not fixture_files: # Warning kept for backwards-compatibility; why not an exception? warnings.warn("No fixture named '%s' found." % fixture_name) - elif fixture_name == 'initial_data': + elif fixture_name == 'initial_data' and fixture_files: warnings.warn( 'initial_data fixtures are deprecated. Use data migrations instead.', RemovedInDjango19Warning