[1.7.x] Only warn about initial data if fixtures have been found.

Backport of 2ab0ed7b28 from master.
2014-07-27 13:23:16 +02:00 · 2014-07-27 13:23:16 +02:00 · f8ec200671
parent df0d5ea7bc
commit f8ec200671
1 changed files with 1 additions and 1 deletions
--- a/django/core/management/commands/loaddata.py
+++ b/django/core/management/commands/loaddata.py
@ -224,7 +224,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