summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2008-12-14 19:31:26 +0000
committerKaren Tracey <kmtracey@gmail.com>2008-12-14 19:31:26 +0000
commit4bede45816e577983b9df0d1ebce2c0a4c4283c7 (patch)
tree8eacb75857cf4e0ee59629e2b9631e3892da0f55
parent5257fd222541cb8bd37a7c33d9fea0267374d387 (diff)
Remove some code in loaddata that bails out of searching for fixture files (only when verbosity > 1) as soon as attempting to open any potential fixture file fails. This code looks to have been mistakenly added in r9527; loaddata ought to proceed with attempting to locate other fixture files, regardless of verbosity setting, as it did before r9527.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9646 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/management/commands/loaddata.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/django/core/management/commands/loaddata.py b/django/core/management/commands/loaddata.py
index 0912d9aee0..89d195e4cd 100644
--- a/django/core/management/commands/loaddata.py
+++ b/django/core/management/commands/loaddata.py
@@ -184,10 +184,6 @@ class Command(BaseCommand):
if verbosity > 1:
print "No %s fixture '%s' in %s." % \
(format, fixture_name, humanize(fixture_dir))
- print e
- transaction.rollback()
- transaction.leave_transaction_management()
- return
# If we found even one object in a fixture, we need to reset the
# database sequences.