From 2bdbe255a73f149f3cbae82cde55f9bf9064c050 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 15 Oct 2014 17:26:54 +0200 Subject: [PATCH] [FIX] config: fix parsing of geoip db paramater, rename command-line option for consistency --- openerp/tools/config.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openerp/tools/config.py b/openerp/tools/config.py index 0dbc29f8471..49fbd953776 100644 --- a/openerp/tools/config.py +++ b/openerp/tools/config.py @@ -282,7 +282,7 @@ class configmanager(object): type="int") group.add_option("--unaccent", dest="unaccent", my_default=False, action="store_true", help="Use the unaccent function provided by the database when available.") - group.add_option("--geoip_db", dest="geoip_database", my_default='/usr/share/GeoIP/GeoLiteCity.dat', action="store_true", + group.add_option("--geoip-db", dest="geoip_database", my_default='/usr/share/GeoIP/GeoLiteCity.dat', help="Absolute path to the GeoIP database file.") parser.add_option_group(group) @@ -397,8 +397,9 @@ class configmanager(object): 'db_maxconn', 'import_partial', 'addons_path', 'xmlrpc', 'syslog', 'without_demo', 'timezone', 'xmlrpcs_interface', 'xmlrpcs_port', 'xmlrpcs', - 'secure_cert_file', 'secure_pkey_file', 'dbfilter', 'log_handler', 'log_level', 'log_db' - ] + 'secure_cert_file', 'secure_pkey_file', 'dbfilter', 'log_handler', 'log_level', 'log_db', + 'geoip_database', + ] for arg in keys: # Copy the command-line argument (except the special case for log_handler, due to