diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2008-11-24 22:33:18 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2008-11-24 22:33:18 +0000 |
| commit | 714490ba5170a9181210a8bfce45147fb936d6c1 (patch) | |
| tree | 23f1d247713ac0e8f9d52d306bd0f52f6ea1093c | |
| parent | 4aa97f5c18f1242d4ef33931cf7567f997f24a6f (diff) | |
Fixed a bug introduced by [9527] -- empty/invalid fixtures were no longer being reported.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9531 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/core/management/commands/loaddata.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/core/management/commands/loaddata.py b/django/core/management/commands/loaddata.py index 5216e1522c..f3d8d26cd3 100644 --- a/django/core/management/commands/loaddata.py +++ b/django/core/management/commands/loaddata.py @@ -160,7 +160,7 @@ class Command(BaseCommand): (full_path, traceback.format_exc()))) 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: @@ -170,7 +170,7 @@ class Command(BaseCommand): transaction.rollback() transaction.leave_transaction_management() return - + except Exception, e: if verbosity > 1: print "No %s fixture '%s' in %s." % \ |