Commit f8ec2006 authored by Florian Apolloner's avatar Florian Apolloner
Browse files

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

Backport of 2ab0ed7b from master.
parent df0d5ea7
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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