| Previous changeset 11:71dfde92fd57 (2019-12-25) Next changeset 13:ebcd8649c621 (2021-10-14) |
|
Commit message:
"planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/bcftools commit 8ad854180e3be0934cdb1f0021886199a2edf9c3" |
|
modified:
macros.xml |
| b |
| diff -r 71dfde92fd57 -r c39113e2ae34 macros.xml --- a/macros.xml Wed Dec 25 12:29:19 2019 -0500 +++ b/macros.xml Fri Feb 05 19:38:32 2021 +0000 |
| [ |
| @@ -436,11 +436,19 @@ #end if </token> + <xml name="macro_include_exclude_validate_sanitize"> + <validator type="expression" message="Single quote or trailing backslash not allowed">"'" not in value and value[-1] != "\\"</validator> + <sanitizer> + <valid initial="string.ascii_letters,string.digits,string.whitespace,string.punctuation"> + <remove value="@" /> + <remove value="'" /> + </valid> + </sanitizer> + </xml> <xml name="macro_include"> <param argument="--include" type="text" optional="true" label="Include" help="Select sites for which the expression is true"> - <validator type="regex" message="Single quote not allowed">^[^']*$</validator> - <sanitizer sanitize="False"/> + <expand macro="macro_include_exclude_validate_sanitize" /> </param> </xml> <token name="@INCLUDE@"> @@ -448,11 +456,10 @@ --include '${section.include}' #end if </token> - + <xml name="macro_exclude"> <param argument="--exclude" type="text" optional="true" label="Exclude" help="Exclude sites for which the expression is true"> - <validator type="regex" message="Single quote not allowed">^[^']*$</validator> - <sanitizer sanitize="False"/> + <expand macro="macro_include_exclude_validate_sanitize" /> </param> </xml> <token name="@EXCLUDE@"> |