Ticket #4431: 4431.diff

django/core/management/commands/dumpdata.py

@@ -18 +18 @@
 
         format = options.get('format', 'json')
         indent = options.get('indent', None)
+        show_traceback = options.get('traceback', False)
 
         if len(app_labels) == 0:
             app_list = get_apps()
@@ -38 +39 @@
         try:
             return serializers.serialize(format, objects, indent=indent)
         except Exception, e:
+            if show_traceback:
+                raise
             raise CommandError("Unable to serialize database: %s" % e)

django/core/management/commands/loaddata.py

@@ -27 +27 @@
         self.style = no_style()
 
         verbosity = int(options.get('verbosity', 1))
+        show_traceback = options.get('traceback', False)
 
         # Keep a count of the installed objects and fixtures
         count = [0, 0]
@@ -98 +99 @@
                                 label_found = True
                             except Exception, e:
                                 fixture.close()
+                                transaction.rollback()
+                                transaction.leave_transaction_management()
+                                if show_traceback:
+                                    raise
                                 sys.stderr.write(
                                     self.style.ERROR("Problem installing fixture '%s': %s\n" %
                                          (full_path, str(e))))
-                                transaction.rollback()
-                                transaction.leave_transaction_management()
                                 return
                             fixture.close()
                     except:
+                        if show_traceback:
+                            raise
                         if verbosity > 1:
                             print "No %s fixture '%s' in %s." % \
                                 (format, fixture_name, humanize(fixture_dir))

django/core/management/base.py

@@ -27 +27 @@
             help='The Python path to a settings module, e.g. "myproject.settings.main". If this isn\'t provided, the DJANGO_SETTINGS_MODULE environment variable will be used.'),
         make_option('--pythonpath',
             help='A directory to add to the Python path, e.g. "/home/djangoprojects/myproject".'),
+        make_option('--traceback', action='store_true',
+            help='Print traceback on exception'),
     )
     help = ''
     args = ''