Ticket #9011: loaddata_file_format_invalid.patch

django/core/management/commands/loaddata.py

@@ -136 +136 @@
                                              (full_path, traceback.format_exc())))
                                 return
                             fixture.close()
+
+                            # If any of the fixtures we loaded contain 0 objects, assume that an
+                            # error was encountered during fixture loading.
+                            if 0 in objects_per_fixture:
+                                sys.stderr.write(
+                                    self.style.ERROR("No fixture data found for '%s'. (File format may be invalid.)" %
+                                        (fixture_name)))
+                                transaction.rollback()
+                                transaction.leave_transaction_management()
+                                return
                     except:
                         if verbosity > 1:
                             print "No %s fixture '%s' in %s." % \
                                 (format, fixture_name, humanize(fixture_dir))
 
 
-        # If any of the fixtures we loaded contain 0 objects, assume that an
-        # error was encountered during fixture loading.
-        if 0 in objects_per_fixture:
-            sys.stderr.write(
-                self.style.ERROR("No fixture data found for '%s'. (File format may be invalid.)" %
-                    (fixture_name)))
-            transaction.rollback()
-            transaction.leave_transaction_management()
-            return
-            
         # If we found even one object in a fixture, we need to reset the
         # database sequences.
         if object_count > 0: