From: Marcin Koziej Date: Tue, 31 Jan 2012 12:20:49 +0000 (+0100) Subject: Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/7b1886edd19944188aaa7e8726ceecc977851483?hp=3714e3974a190bbfd7bb16404682c5d9b439bf40 Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty --- diff --git a/apps/catalogue/management/commands/importbooks.py b/apps/catalogue/management/commands/importbooks.py index 7fe602254..ff9184e47 100644 --- a/apps/catalogue/management/commands/importbooks.py +++ b/apps/catalogue/management/commands/importbooks.py @@ -127,7 +127,8 @@ class Command(BaseCommand): else: self.import_book(file_path, options) files_imported += 1 - + transaction.commit() + except (Book.AlreadyExists, Picture.AlreadyExists): print self.style.ERROR('%s: Book or Picture already imported. Skipping. To overwrite use --force.' % file_path)