Add the name of the wrong parameter in the messagebox, if the description has an...

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2334 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py
index ee713ab4e459e05c0cd5ced60062c4a834961ded..cf1340d02b29295012d12f759e3afcc5b6b29390 100644 (file)
--- a/wizard/BModulePage.py
+++ b/wizard/BModulePage.py
@@ -47,11 +47,11 @@ class BModulePage(BWizardPage):
                     configurations[informations["configuration"]] = bertos_utils.loadConfigurationInfos(self._projectInfoRetrieve("SOURCES_PATH") +
                                                                                                         "/" + informations["configuration"])
         except ModuleDefineException, e:
-            self._exceptionOccurred(self.tr("Error parsing module information in file %1").arg(e.parameter))
+            self._exceptionOccurred(self.tr("Error parsing module information in file %1").arg(e.path))
         except EnumDefineException, e:
-            self._exceptionOccurred(self.tr("Error parsing enum informations in file %1").arg(e.parameter))
+            self._exceptionOccurred(self.tr("Error parsing enum informations in file %1").arg(e.path))
         except ConfigurationDefineException, e:
-            self._exceptionOccurred(self.tr("Error parsing configuration informations in file %1").arg(e.parameter))
+            self._exceptionOccurred(self.tr("Error parsing configuration informations in file %1, reading parameter %2").arg(e.path).arg(e.name))
         else:
             self._projectInfoStore("MODULES", modules)
             self._projectInfoStore("LISTS", lists)

diff --git a/wizard/DefineException.py b/wizard/DefineException.py
index acaebc54908936ef1dd7ce1ed85cb47781b97801..fabb4d90971052aaf0457f9ad85e8d53e870840a 100644 (file)
--- a/wizard/DefineException.py
+++ b/wizard/DefineException.py
@@ -14,29 +14,30 @@ class DefineException(Exception):
     """
     Exception raised when an error occurs parsing the module informations.
     """
-    def __init__(self, value):
-        self.parameter = value
+    def __init__(self, path):
+        self.path = path
     
     def __str__(self):
-        return repr(self.parameter)
+        return repr(self.path)
 
 class ModuleDefineException(DefineException):
     """
     Exception raised when an error occurs parsing the module informations.
     """
-    def __init__(self, value):
-        super(ModuleDefineException, self).__init__(value)
+    def __init__(self, path):
+        super(ModuleDefineException, self).__init__(path)
 
 class EnumDefineException(DefineException):
     """
     Exception raised when an error occurs parsing the enum informations.
     """
-    def __init__(self, value):
-        super(EnumDefineException, self).__init__(value)
+    def __init__(self, path):
+        super(EnumDefineException, self).__init__(path)
 
 class ConfigurationDefineException(DefineException):
     """
     Exception raised when an error occurs parsing the configuration parameter informations.
     """
-    def __init__(self, value):
-        super(ConfigurationDefineException, self).__init__(value)
+    def __init__(self, path, name):
+        super(ConfigurationDefineException, self).__init__(path)
+        self.name = name

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index 925774ba387fefe0761b66364763fb40c9a8bc9d..bcb4a4afc6e29a404f5668f97aff0b5a9a4d35e4 100644 (file)
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -225,7 +225,7 @@ def loadConfigurationInfos(path):
             configurationInfos[name]["description"] = description
         return configurationInfos
     except SyntaxError:
-        raise DefineException.ConfigurationDefineException(path)
+        raise DefineException.ConfigurationDefineException(path, name)
 
 def loadModuleInfos(path):
     """