Commit ee882b6a authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Fixed #6497 -- Improved fixture error reporting by displaying the entire... 

Fixed #6497 -- Improved fixture error reporting by displaying the entire traceback. Also, SystemExit and KeyboardInterrupt now exit the script properly. Thanks for the patch, Bastian Kleineidam

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent a0a06d1a

django/core/management/commands/loaddata.py

+5 −2
Original line number Diff line number Diff line
@@ -111,7 +111,10 @@ class Command(BaseCommand): 
                                    models.add(obj.object.__class__)

                                    obj.save()

                                label_found = True

                            except Exception, e:

                            except (SystemExit, KeyboardInterrupt):

                                raise

                            except Exception:

                                import traceback

                                fixture.close()

                                transaction.rollback()

                                transaction.leave_transaction_management()
@@ -121,7 +124,7 @@ class Command(BaseCommand): 
                                else:

                                    sys.stderr.write(

                                        self.style.ERROR("Problem installing fixture '%s': %s\n" %

                                             (full_path, str(e))))

                                             (full_path, traceback.format_exc())))

                                return

                            fixture.close()

                    except: