From: Marcin Koziej Date: Thu, 6 Oct 2011 12:10:08 +0000 (+0200) Subject: Merge branch 'opds-stats' X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/849f19a3c55d9846b7b671ce516b0934b62777b5?hp=348a4de144b31930d979a0368ac6f913fbad9773 Merge branch 'opds-stats' --- diff --git a/apps/catalogue/management/commands/importbooks.py b/apps/catalogue/management/commands/importbooks.py index ea3768ba7..f51214d72 100644 --- a/apps/catalogue/management/commands/importbooks.py +++ b/apps/catalogue/management/commands/importbooks.py @@ -24,7 +24,7 @@ class Command(BaseCommand): help='Don\'t build EPUB file'), make_option('-T', '--no-build-txt', action='store_false', dest='build_txt', default=True, help='Don\'t build TXT file'), - make_option('-T', '--no-build-pdf', action='store_false', dest='build_pdf', default=True, + make_option('-P', '--no-build-pdf', action='store_false', dest='build_pdf', default=True, help='Don\'t build PDF file'), make_option('-w', '--wait-until', dest='wait_until', metavar='TIME', help='Wait until specified time (Y-M-D h:m:s)'), diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py index 9b346351b..946a6216e 100644 --- a/wolnelektury/settings.py +++ b/wolnelektury/settings.py @@ -219,6 +219,9 @@ MAX_TAG_LIST = 6 NO_BUILD_EPUB = False NO_BUILD_TXT = False +NO_BUILD_PDF = False + + # Load localsettings, if they exist try: