From 68089deab4cdbd7e359f23c95ac9fbab3dd08297 Mon Sep 17 00:00:00 2001 From: duplo Date: Thu, 3 Sep 2009 14:35:21 +0000 Subject: [PATCH] Utilizzate le configurazioni in memoria, nel tentativo di modificare la versione di BeRTOS utilizzata. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2875 38d2e660-2303-0410-9eaa-f027e97ec537 --- wizard/BEditingDialog.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/wizard/BEditingDialog.py b/wizard/BEditingDialog.py index eacfbfe2..46c184d2 100644 --- a/wizard/BEditingDialog.py +++ b/wizard/BEditingDialog.py @@ -135,8 +135,18 @@ class BEditingDialog(QDialog): version_page.setProjectInfo("SOURCES_PATH", version) version_page.setProjectInfo("OLD_SOURCES_PATH", current_version) enabled_modules = bertos_utils.enabledModules(version_page.project()) + old_configuration = version_page.projectInfo("CONFIGURATIONS") bertos_utils.loadSourceTree(version_page.project()) - bertos_utils.loadModuleData(version_page.project(), True) + bertos_utils.loadModuleData(version_page.project()) + new_configuration = version_page.projectInfo("CONFIGURATIONS") + merged_configuration = {} + for conf in new_configuration: + if conf in old_configuration: + configuration = bertos_utils.updateConfigurationValues(new_configuration[conf], old_configuration[conf]) + else: + configuration = new_configuration[conf] + merged_configuration[conf] = configuration + version_page.setProjectInfo("CONFIGURATIONS", merged_configuration) bertos_utils.setEnabledModules(version_page.project(), enabled_modules) self.module_page.fillModuleTree() -- 2.25.1