From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SojdY-0006td-H6 for garchives@archives.gentoo.org; Tue, 10 Jul 2012 23:14:32 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A031E0724; Tue, 10 Jul 2012 23:14:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6C533E0724 for ; Tue, 10 Jul 2012 23:14:00 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7899D1B4025 for ; Tue, 10 Jul 2012 23:13:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3AC54E5433 for ; Tue, 10 Jul 2012 23:13:58 +0000 (UTC) From: "Slava Bacherikov" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Slava Bacherikov" Message-ID: <1341824590.15132e707152477799baac0b714afb3c80f9cec2.bacher09@gentoo> Subject: [gentoo-commits] proj/gentoo-packages:master commit in: gpackages/main/ X-VCS-Repository: proj/gentoo-packages X-VCS-Files: gpackages/main/settings.py X-VCS-Directories: gpackages/main/ X-VCS-Committer: bacher09 X-VCS-Committer-Name: Slava Bacherikov X-VCS-Revision: 15132e707152477799baac0b714afb3c80f9cec2 X-VCS-Branch: master Date: Tue, 10 Jul 2012 23:13:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 8c9adc83-b607-453e-9e8a-6e6257bf4856 X-Archives-Hash: 295a9ee3500b5e75c6838a31d72dfe7b commit: 15132e707152477799baac0b714afb3c80f9cec2 Author: Slava Bacherikov bacher09 org> AuthorDate: Mon Jul 9 09:03:10 2012 +0000 Commit: Slava Bacherikov bacherikov org ua> CommitDate: Mon Jul 9 09:03:10 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoo-packag= es.git;a=3Dcommit;h=3D15132e70 Change settings.py --- gpackages/main/settings.py | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/gpackages/main/settings.py b/gpackages/main/settings.py index 8069e8e..0d868d6 100644 --- a/gpackages/main/settings.py +++ b/gpackages/main/settings.py @@ -135,18 +135,6 @@ INSTALLED_APPS =3D ( =20 FIXTURE_DIRS =3D (os.path.join(PROJECT_ROOT, 'fixtures'),) =20 -if DEBUG: - INSTALLED_APPS +=3D ('django.contrib.databrowse', 'debug_toolbar')=20 - EMAIL_BACKEND =3D 'django.core.mail.backends.filebased.EmailBackend' - EMAIL_FILE_PATH =3D os.path.join(PROJECT_ROOT,'mail.mbox') - MIDDLEWARE_CLASSES +=3D ('debug_toolbar.middleware.DebugToolbarMiddl= eware',) - DEBUG_TOOLBAR_CONFIG =3D {'INTERCEPT_REDIRECTS' : False} -else: - TEMPLATE_LOADERS =3D ( - ('django.template.loaders.cached.Loader', TEMPLATE_LOADERS),) - EMAIL_BACKEND =3D 'django.core.mail.backends.smtp.EmailBackend' - EMAIL_HOST =3D 'localhost' - gettext =3D lambda s: s =20 LANGUAGES =3D ( @@ -190,3 +178,16 @@ try: from local_settings import * except ImportError: print("Pleasy provide local_settings") + +if DEBUG: + INSTALLED_APPS +=3D ('django.contrib.databrowse', 'debug_toolbar')=20 + EMAIL_BACKEND =3D 'django.core.mail.backends.filebased.EmailBackend' + EMAIL_FILE_PATH =3D os.path.join(PROJECT_ROOT,'mail.mbox') + MIDDLEWARE_CLASSES +=3D ('debug_toolbar.middleware.DebugToolbarMiddl= eware',) + DEBUG_TOOLBAR_CONFIG =3D {'INTERCEPT_REDIRECTS' : False} +else: + TEMPLATE_LOADERS =3D ( + ('django.template.loaders.cached.Loader', TEMPLATE_LOADERS),) + EMAIL_BACKEND =3D 'django.core.mail.backends.smtp.EmailBackend' + EMAIL_HOST =3D 'localhost' +