Techsystech
/
server-tools
mirror of https://github.com/OCA/server-tools.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[FIX] upgrade_analysis: merged modules affecting noupdate files 

Due to https://github.com/OCA/server-tools/pull/2057, noupdate data now considers merged modules. But the fix was incomplete, as the diff files between merged modules and local_module were rewritting already generated diff between original remote_module and local_module.
pull/2417/head
mreficent 2021-04-21 17:40:16 +02:00 committed by Stefan Rijnhart
parent 94013a7160
commit c919a2e77b
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
upgrade_analysis/models/upgrade_analysis.py
View File

@ -368,7 +368,7 @@ class UpgradeAnalysis(models.Model):
if "name" in element.attrib: if "name" in element.attrib:
query = "./{}[@name='{}']".format(element.tag, element.attrib["name"]) query = "./{}[@name='{}']".format(element.tag, element.attrib["name"])
else: else:
# query = "./%s" % element.tag # query = "./{}".format(element.tag)
continue continue
for existing in target.xpath(query): for existing in target.xpath(query):
target.remove(existing) target.remove(existing)
@ -461,17 +461,27 @@ class UpgradeAnalysis(models.Model):
remote_record_obj = self._get_remote_model(connection, "record") remote_record_obj = self._get_remote_model(connection, "record")
local_record_obj = self.env["upgrade.record"] local_record_obj = self.env["upgrade.record"]
local_modules = local_record_obj.list_modules() local_modules = local_record_obj.list_modules()
for remote_module in remote_record_obj.list_modules(): all_remote_modules = remote_record_obj.list_modules()
local_module = renamed_modules.get( for local_module in local_modules:
remote_paths = []
remote_modules = []
remote_update, remote_noupdate = {}, {}
for remote_module in all_remote_modules:
if local_module == renamed_modules.get(
remote_module, merged_modules.get(remote_module, remote_module) remote_module, merged_modules.get(remote_module, remote_module)
):
remote_paths.extend(
remote_record_obj.get_xml_records(remote_module)
) )
if local_module not in local_modules: remote_modules.append(remote_module)
continue add_remote_update, add_remote_noupdate = self._parse_paths(
remote_paths = remote_record_obj.get_xml_records(remote_module)
local_paths = local_record_obj.get_xml_records(local_module)
remote_update, remote_noupdate = self._parse_paths(
remote_paths, remote_module remote_paths, remote_module
) )
remote_update.update(add_remote_update)
remote_noupdate.update(add_remote_noupdate)
if not remote_modules:
continue
local_paths = local_record_obj.get_xml_records(local_module)
local_update, local_noupdate = self._parse_paths(local_paths, local_module) local_update, local_noupdate = self._parse_paths(local_paths, local_module)
diff = self._get_xml_diff( diff = self._get_xml_diff(
remote_update, remote_noupdate, local_update, local_noupdate remote_update, remote_noupdate, local_update, local_noupdate