
Hi Michal, Comments below. On 08/06/2012 10:30 AM, Michal Privoznik wrote:
On 03.08.2012 16:18, Marcelo Cerri wrote: ...
@@ -148,18 +148,32 @@ <!-- A per-device seclabel override is more limited, either relabel=no or a <label> must be present. --> <choice> - <attribute name='relabel'> - <value>no</value> - </attribute> <group> <optional> + <attribute name='model'> + <text/> + </attribute> + </optional> + <attribute name='relabel'> + <value>no</value> + </attribute> + </group> + <group> + <optional> + <attribute name='model'> + <text/> + </attribute> + </optional> + <optional>
IIUC, both 'model' and 'relabel' are purely optional. If that is the case, the first <group> can be left out.
The idea here is to not allow "label" elements when relabel="no".
<attribute name='relabel'> <value>yes</value> </attribute> </optional> - <element name='label'> - <text/> - </element> + <zeroOrMore> + <element name='label'> + <text/> + </element> + </zeroOrMore>
Regards, Marcelo