From 06c584528f975dd03b30fc4c0a3b7fa95cbb0b6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Wei=C3=9F?= Date: Sun, 4 Sep 2011 23:33:20 +0200 Subject: Make database_port setting optional Make the database_port configuration parameter optional (as documented in doc/reports/dynamic.txt). The default port will now be used if the database_port is not explicitly set. --- src/lib/Server/Reports/settings.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/Server/Reports/settings.py b/src/lib/Server/Reports/settings.py index fff30d30a..869f09f1f 100644 --- a/src/lib/Server/Reports/settings.py +++ b/src/lib/Server/Reports/settings.py @@ -42,7 +42,10 @@ if db_engine != 'sqlite3': DATABASES['default']['USER'] = c.get('statistics', 'database_user') DATABASES['default']['PASSWORD'] = c.get('statistics', 'database_password') DATABASES['default']['HOST'] = c.get('statistics', 'database_host') - DATABASES['default']['PORT'] = c.get('statistics', 'database_port') + try: + DATABASES['default']['PORT'] = c.get('statistics', 'database_port') + except: # An empty string tells Django to use the default port. + DATABASES['default']['PORT'] = '' if django.VERSION[0] == 1 and django.VERSION[1] < 2: DATABASE_ENGINE = db_engine -- cgit v1.2.3-1-g7c22