diff options
| author | Xavier-Do <xdo@odoo.com> | 2020-02-03 14:19:56 +0000 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2020-02-04 13:19:02 +0000 |
| commit | 9c26d4d8707f3ccad4284c597b52bd2bd18f72dc (patch) | |
| tree | f8bd5bf5d6e91bbded17d6b7f19da9274b94fbc0 /odoo/tools/config.py | |
| parent | 39018e751519c7edd5c3c58bcb3ef2942ec80064 (diff) | |
[IMP] core: rename upgrades-paths to upgrade-path
Since this option is soon to be used, this rename is a last tweek
to make it more logical to use since it will point to a single
upgrade dir most of the time.
closes odoo/odoo#44593
X-original-commit: 1c8e2809fb296abce6114b7da906d48a240df418
Signed-off-by: Xavier Dollé (xdo) <xdo@odoo.com>
Diffstat (limited to 'odoo/tools/config.py')
| -rw-r--r-- | odoo/tools/config.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/odoo/tools/config.py b/odoo/tools/config.py index 81d1f448f7e..9401d94ecda 100644 --- a/odoo/tools/config.py +++ b/odoo/tools/config.py @@ -120,9 +120,9 @@ class configmanager(object): group.add_option("--addons-path", dest="addons_path", help="specify additional addons paths (separated by commas).", action="callback", callback=self._check_addons_path, nargs=1, type="string") - group.add_option("--upgrades-paths", dest="upgrades_paths", - help="specify an additional upgrades path.", - action="callback", callback=self._check_upgrades_paths, nargs=1, type="string") + group.add_option("--upgrade-path", dest="upgrade_path", + help="specify an additional upgrade path.", + action="callback", callback=self._check_upgrade_path, nargs=1, type="string") group.add_option("--load", dest="server_wide_modules", help="Comma-separated list of server-wide modules.", my_default='base,web') group.add_option("-D", "--data-dir", dest="data_dir", my_default=_get_default_datadir(), @@ -425,7 +425,7 @@ class configmanager(object): 'db_name', 'db_user', 'db_password', 'db_host', 'db_sslmode', 'db_port', 'db_template', 'logfile', 'pidfile', 'smtp_port', 'email_from', 'smtp_server', 'smtp_user', 'smtp_password', - 'db_maxconn', 'import_partial', 'addons_path', 'upgrades_paths', + 'db_maxconn', 'import_partial', 'addons_path', 'upgrade_path', 'syslog', 'without_demo', 'screencasts', 'screenshots', 'dbfilter', 'log_level', 'log_db', 'log_db_level', 'geoip_database', 'dev_mode', 'shell_interface' @@ -490,10 +490,10 @@ class configmanager(object): self._normalize(x) for x in self.options['addons_path'].split(',')) - self.options["upgrades_paths"] = ( + self.options["upgrade_path"] = ( ",".join(self._normalize(x) - for x in self.options['upgrades_paths'].split(',')) - if self.options['upgrades_paths'] + for x in self.options['upgrade_path'].split(',')) + if self.options['upgrade_path'] else "" ) @@ -553,8 +553,8 @@ class configmanager(object): setattr(parser.values, option.dest, ",".join(ad_paths)) - def _check_upgrades_paths(self, option, opt, value, parser): - upgrades_paths = [] + def _check_upgrade_path(self, option, opt, value, parser): + upgrade_path = [] for path in value.split(','): path = path.strip() res = self._normalize(path) @@ -562,9 +562,9 @@ class configmanager(object): raise optparse.OptionValueError("option %s: no such directory: %r" % (opt, path)) if not self._is_upgrades_path(res): raise optparse.OptionValueError("option %s: the path %r is not a valid upgrade directory" % (opt, path)) - if res not in upgrades_paths: - upgrades_paths.append(res) - setattr(parser.values, option.dest, ",".join(upgrades_paths)) + if res not in upgrade_path: + upgrade_path.append(res) + setattr(parser.values, option.dest, ",".join(upgrade_path)) def _is_upgrades_path(self, res): return any( |
