From 9c26d4d8707f3ccad4284c597b52bd2bd18f72dc Mon Sep 17 00:00:00 2001 From: Xavier-Do Date: Mon, 3 Feb 2020 14:19:56 +0000 Subject: [IMP] core: rename upgrades-paths to upgrade-path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- odoo/modules/migration.py | 12 ++++++------ odoo/modules/module.py | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'odoo/modules') diff --git a/odoo/modules/migration.py b/odoo/modules/migration.py index f1b00a6def7..bd5e8f3a132 100644 --- a/odoo/modules/migration.py +++ b/odoo/modules/migration.py @@ -12,7 +12,7 @@ from os.path import join as opj from odoo.modules.module import get_resource_path import odoo.release as release -import odoo.upgrades +import odoo.upgrade from odoo.tools.parse_version import parse_version _logger = logging.getLogger(__name__) @@ -62,8 +62,8 @@ class MigrationManager(object): self._get_files() def _get_files(self): - def _get_upgrades_paths(pkg): - for path in odoo.upgrades.__path__: + def _get_upgrade_path(pkg): + for path in odoo.upgrade.__path__: upgrade_path = opj(path, pkg) if os.path.exists(upgrade_path): return upgrade_path @@ -86,7 +86,7 @@ class MigrationManager(object): self.migrations[pkg.name] = { 'module': get_scripts(get_resource_path(pkg.name, 'migrations')), 'module_upgrades': get_scripts(get_resource_path(pkg.name, 'upgrades')), - 'upgrades': get_scripts(_get_upgrades_paths(pkg.name)), + 'upgrade': get_scripts(_get_upgrade_path(pkg.name)), } def migrate_module(self, pkg, stage): @@ -133,9 +133,9 @@ class MigrationManager(object): 'module_upgrades': opj(pkg.name, 'upgrades'), } - for path in odoo.upgrades.__path__: + for path in odoo.upgrade.__path__: if os.path.exists(opj(path, pkg.name)): - mapping['upgrades'] = opj(path, pkg.name) + mapping['upgrade'] = opj(path, pkg.name) break for x in mapping: diff --git a/odoo/modules/module.py b/odoo/modules/module.py index dd8fde100f2..154a4df1093 100644 --- a/odoo/modules/module.py +++ b/odoo/modules/module.py @@ -55,24 +55,24 @@ def initialize_sys_path(): if base_path not in odoo.addons.__path__ and os.path.isdir(base_path): odoo.addons.__path__.append(base_path) - # hook odoo.upgrades on upgrades paths - from odoo import upgrades - for up in tools.config['upgrades_paths'].split(','): + # hook odoo.upgrade on upgrade-path + from odoo import upgrade + for up in tools.config['upgrade_path'].split(','): up = os.path.normcase(os.path.abspath(tools.ustr(up.strip()))) - if up not in upgrades.__path__: - upgrades.__path__.append(up) + if up not in upgrade.__path__: + upgrade.__path__.append(up) - # hook odoo.upgrades on legacy odoo/addons/base/maintenance/migrations symlink - if not tools.config['upgrades_paths']: - upgrades.__path__.append(os.path.join( + # hook odoo.upgrade on legacy odoo/addons/base/maintenance/migrations symlink + if not tools.config['upgrade_path']: + upgrade.__path__.append(os.path.join( base_path, 'base', 'maintenance', 'migrations')) - # create decrecated module alias from odoo.addons.base.maintenance.migrations to odoo.upgrades + # create decrecated module alias from odoo.addons.base.maintenance.migrations to odoo.upgrade spec = importlib.machinery.ModuleSpec("odoo.addons.base.maintenance", None, is_package=True) maintenance_pkg = importlib.util.module_from_spec(spec) - maintenance_pkg.migrations = upgrades + maintenance_pkg.migrations = upgrade sys.modules["odoo.addons.base.maintenance"] = maintenance_pkg - sys.modules["odoo.addons.base.maintenance.migrations"] = upgrades + sys.modules["odoo.addons.base.maintenance.migrations"] = upgrade def get_module_path(module, downloaded=False, display_warning=True): """Return the path of the given module. -- cgit v1.2.3