Changeset 9528

Timestamp:

11/24/08 15:13:33 (2 months ago)

Author:

jacob

Message:

Fixed a bug introduced by [9527] -- empty/invalid fixtures were no longer being reported.

Files:

• django/trunk/django/core/management/commands/loaddata.py (modified) (3 diffs)

django/trunk/django/core/management/commands/loaddata.py

@@ -133 +133 @@
-                            else:
-                                fixture_count += 1
+                                objects_in_fixture = 0
-                                if verbosity > 0:
-                                    print "Installing %s fixture '%s' from %s." % \
@@ -139 +140 @@
-                                    objects = serializers.deserialize(format, fixture)
-                                    for obj in objects:
-_count
+s_in_fixture
-                                        models.add(obj.object.__class__)
-                                        obj.save()
+                                    object_count += objects_in_fixture
-                                    label_found = True
-                                except (SystemExit, KeyboardInterrupt):
@@ -159 +161 @@
-                                    return
-                                fixture.close()
+                                
+                                # If the fixture we loaded contains 0 objects, assume that an
+                                # error was encountered during fixture loading.
+                                if objects_in_fixture == 0:
+                                    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 Exception, e:
-                            if verbosity > 1: