X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBProject.py;h=125a2936c51fcb0e9133ab7abe819541fe6eddd4;hb=21e0c7ea5cb63c2baa5a331d8ccc3fd8a55856bc;hp=0fc1b7f7f366d2f1da3186ead4e291c96dbd7a66;hpb=44987672fae5ddd002f48595a29ccdf2702a33d8;p=bertos.git diff --git a/wizard/BProject.py b/wizard/BProject.py index 0fc1b7f7..125a2936 100644 --- a/wizard/BProject.py +++ b/wizard/BProject.py @@ -263,14 +263,14 @@ class BProject(object): cfg_file_path = os.path.join(self.bertos_srcdir, configuration) configuration_info[configuration] = loadConfigurationInfos(cfg_file_path) except ParseError, err: - raise DefineException.ConfigurationDefineException(self.infos["BERTOS_PATH"] + "/" + configuration, err.line_number, err.line) + raise DefineException.ConfigurationDefineException(cfg_file_path, err.line_number, err.line) if edit: try: path = self.infos["PROJECT_SRC_PATH"] cfg_file_path = os.path.join(path, configuration) - configuration_info[configuration] = updateConfigurationValues(configuration_info[configuration], cfg_file_path) + configuration_info[configuration] = updateConfigurationValues(configuration_info[configuration], loadConfigurationInfos(cfg_file_path)) except ParseError, err: - raise DefineException.ConfigurationDefineException(configuration.replace("bertos", path)) + raise DefineException.ConfigurationDefineException(cfg_file_path, err.line_number, err.line) module_info_dict.update(module_dict) configuration_info_dict.update(configuration_info) if to_be_parsed: