Merge pull request #1134 from senko/ticket_18990

Fixed #18990: Loaddata now complains if fixture doesn't exist

1 files changed, 10 insertions, 2 deletions

diff --git a/django/core/management/commands/loaddata.py b/django/core/management/commands/loaddata.py
index c95d11cf60..ab9f7468c4 100644
--- a/django/core/management/commands/loaddata.py
+++ b/django/core/management/commands/loaddata.py
@@ -4,6 +4,7 @@ import os
 import gzip
 import zipfile
 from optparse import make_option
+import warnings
 
 from django.conf import settings
 from django.core import serializers
@@ -162,9 +163,14 @@ class Command(BaseCommand):
         else:
             fixture_dirs = app_fixtures + list(settings.FIXTURE_DIRS) + ['']
 
+        label_found = False
         for fixture_dir in fixture_dirs:
-            self.process_dir(fixture_dir, fixture_name, compression_formats,
-                             formats)
+            found = self.process_dir(fixture_dir, fixture_name,
+                compression_formats, formats)
+            label_found = label_found or found
+
+        if fixture_name != 'initial_data' and not label_found:
+            warnings.warn("No fixture named '%s' found." % fixture_name)
 
     def process_dir(self, fixture_dir, fixture_name, compression_formats,
                     serialization_formats):
@@ -242,3 +248,5 @@ class Command(BaseCommand):
                     raise CommandError(
                         "No fixture data found for '%s'. (File format may be invalid.)" %
                             (fixture_name))
+
+        return label_found