p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Jacob Kaplan-Moss 2008-11-24 22:33:18 +00:00
parent 4aa97f5c18
commit 714490ba51
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/core/management/commands/loaddata.py
View File

@ -160,7 +160,7 @@ class Command(BaseCommand):
(full_path, traceback.format_exc()))) (full_path, traceback.format_exc())))
return return
fixture.close() fixture.close()
# If the fixture we loaded contains 0 objects, assume that an # If the fixture we loaded contains 0 objects, assume that an
# error was encountered during fixture loading. # error was encountered during fixture loading.
if objects_in_fixture == 0: if objects_in_fixture == 0:
@ -170,7 +170,7 @@ class Command(BaseCommand):
transaction.rollback() transaction.rollback()
transaction.leave_transaction_management() transaction.leave_transaction_management()
return return
except Exception, e: except Exception, e:
if verbosity > 1: if verbosity > 1:
print "No %s fixture '%s' in %s." % \ print "No %s fixture '%s' in %s." % \