| 1 | --- loaddata.py 2010-01-12 10:54:47.000000000 -0800
|
|---|
| 2 | +++ /usr/lib64/python2.6/site-packages/django/core/management/commands/loaddata.py 2010-01-12 10:54:17.000000000 -0800
|
|---|
| 3 | @@ -105,7 +105,7 @@ class Command(BaseCommand):
|
|---|
| 4 | (fixture_name, format)))
|
|---|
| 5 | transaction.rollback()
|
|---|
| 6 | transaction.leave_transaction_management()
|
|---|
| 7 | - sys.exit(1)
|
|---|
| 8 | + return
|
|---|
| 9 |
|
|---|
| 10 | if os.path.isabs(fixture_name):
|
|---|
| 11 | fixture_dirs = [fixture_name]
|
|---|
| 12 | @@ -138,7 +138,7 @@ class Command(BaseCommand):
|
|---|
| 13 | (fixture_name, humanize(fixture_dir)))
|
|---|
| 14 | transaction.rollback()
|
|---|
| 15 | transaction.leave_transaction_management()
|
|---|
| 16 | - sys.exit(1)
|
|---|
| 17 | + return
|
|---|
| 18 | else:
|
|---|
| 19 | fixture_count += 1
|
|---|
| 20 | objects_in_fixture = 0
|
|---|
| 21 | @@ -167,7 +167,7 @@ class Command(BaseCommand):
|
|---|
| 22 | self.style.ERROR("Problem installing fixture '%s': %s\n" %
|
|---|
| 23 | (full_path, ''.join(traceback.format_exception(sys.exc_type,
|
|---|
| 24 | sys.exc_value, sys.exc_traceback)))))
|
|---|
| 25 | - sys.exit(1)
|
|---|
| 26 | + return
|
|---|
| 27 | fixture.close()
|
|---|
| 28 |
|
|---|
| 29 | # If the fixture we loaded contains 0 objects, assume that an
|
|---|
| 30 | @@ -178,7 +178,7 @@ class Command(BaseCommand):
|
|---|
| 31 | (fixture_name)))
|
|---|
| 32 | transaction.rollback()
|
|---|
| 33 | transaction.leave_transaction_management()
|
|---|
| 34 | - sys.exit(1)
|
|---|
| 35 | + return
|
|---|
| 36 |
|
|---|
| 37 | except Exception, e:
|
|---|
| 38 | if verbosity > 1:
|
|---|