[FIX] config: fix parsing of geoip db paramater, rename command-line …

…option for consistency
woaiduck · Oct 15, 2014 · 2bdbe25 · 2bdbe25
1 parent 2cde559
commit 2bdbe25
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
@@ -282,7 +282,7 @@ def __init__(self, fname=None):
                          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 @@ def die(cond, msg):
                 '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