summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYSA,JVO <>2009-08-20 18:37:49 +0530
committerJay (Open ERP) <jvo@tinyerp.com>2009-08-20 18:37:49 +0530
commite76e46f247e3cafc62d2a2b9d8daf02c21394847 (patch)
treecf59d1bc80799ddb3705f5ce44425d4f10bcd455
parentf8aba817650998929d80f291a4ce15dc19ac4680 (diff)
[FIX] Secure option on config file
lp bug: https://launchpad.net/bugs/348217 fixed bzr revid: jvo@tinyerp.com-20090820130749-25an052pa9scuao3
-rw-r--r--bin/tools/config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/tools/config.py b/bin/tools/config.py
index d4d93271da3..1621a11f9c2 100644
--- a/bin/tools/config.py
+++ b/bin/tools/config.py
@@ -230,7 +230,7 @@ class configmanager(object):
keys = ['language', 'translate_out', 'translate_in', 'debug_mode',
'stop_after_init', 'without_demo', 'netrpc', 'xmlrpc', 'syslog']
- if hasSSL:
+ if hasSSL and not self.options['secure']:
keys.append('secure')
for arg in keys: