--- loaddata.py 2010-01-12 10:54:47.000000000 -0800 +++ /usr/lib64/python2.6/site-packages/django/core/management/commands/loaddata.py 2010-01-12 10:54:17.000000000 -0800 @@ -105,7 +105,7 @@ class Command(BaseCommand): (fixture_name, format))) transaction.rollback() transaction.leave_transaction_management() - sys.exit(1) + return if os.path.isabs(fixture_name): fixture_dirs = [fixture_name] @@ -138,7 +138,7 @@ class Command(BaseCommand): (fixture_name, humanize(fixture_dir))) transaction.rollback() transaction.leave_transaction_management() - sys.exit(1) + return else: fixture_count += 1 objects_in_fixture = 0 @@ -167,7 +167,7 @@ class Command(BaseCommand): self.style.ERROR("Problem installing fixture '%s': %s\n" % (full_path, ''.join(traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))))) - sys.exit(1) + return fixture.close() # If the fixture we loaded contains 0 objects, assume that an @@ -178,7 +178,7 @@ class Command(BaseCommand): (fixture_name))) transaction.rollback() transaction.leave_transaction_management() - sys.exit(1) + return except Exception, e: if verbosity > 1: