test multiple xmlfiles in error

src/rougail/annotator.py

@@ -1064,7 +1064,8 @@ class ConstraintAnnotator:
             fill = fills[idx]
             # test if it's redefined calculation
             if fill.target in targets and not fill.redefine:
-                raise DictConsistencyError(_(f"A fill already exists for the target: {fill.target}"))
+                xmlfiles = self.objectspace.display_xmlfiles(fill.xmlfiles)
+                raise DictConsistencyError(_(f'A fill already exists for the target of "{fill.target}" created in {xmlfiles}'))
             targets.append(fill.target)
             #
             if fill.name not in self.functions:

src/rougail/objspace.py

@@ -323,8 +323,7 @@ class CreoleObjSpace:
                          ) -> str:
         if len(xmlfiles) == 1:
             return '"' + xmlfiles[0] + '"'
-        else:
+        return '"' + '", "'.join(xmlfiles[:-1]) + '"' + ' and ' + '"' + xmlfiles[-1] + '"'
-            return '"' + '", "'.join(xmlfiles[:-1]) + '"' + ' and ' + '"' + xmlfiles[-1] + '"'
 
     def create_tree_structure(self,
                               space,

tests/dictionaries/80redefine_double_error/00-base.xml

@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail>
+
+    <services/>
+
+    <variables>
+        <family name="general">
+            <variable name="mode_conteneur_actif" type="oui/non" description="Redefine description" hidden="True">
+                <value>non</value>
+            </variable>
+        </family>
+        <separators/>
+    </variables>
+
+    <constraints>
+    </constraints>
+
+    <help/>
+
+</rougail>
+<!-- vim: ts=4 sw=4 expandtab
+-->

tests/dictionaries/80redefine_double_error/01-base.xml

@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail>
+    <variables>
+        <family name="general">
+            <variable name="mode_conteneur_actif" redefine="True"/>
+        </family>
+    </variables>
+</rougail>
+<!-- vim: ts=4 sw=4 expandtab
+-->

tests/dictionaries/80redefine_double_error/02-base.xml

@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail>
+    <variables>
+        <family name="general">
+            <variable name="mode_conteneur_actif" redefine="True" type="string"/>
+        </family>
+    </variables>
+</rougail>
+<!-- vim: ts=4 sw=4 expandtab
+-->

tests/test_1_flattener.py

@@ -29,7 +29,8 @@ excludes = set([])
 test_ok -= excludes
 test_raise -= excludes
 #test_ok = ['40condition_base_add']
-#test_raise = []
+#test_ok = []
+#test_raise = ['80redefine_double_error']
 
 ORI_DIR = getcwd()