diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 06:50:54 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 06:50:54 +0000 |
commit | 2d845bd16ad5bbc2ac7c04181ed6d2fe741e4ed7 (patch) | |
tree | 8f63797a5f4391c2f5b6918c40450407b32e031c /debian/tests/metadata | |
parent | Releasing progress-linux version 4.12.1-1~progress7.99u1. (diff) | |
download | fence-agents-2d845bd16ad5bbc2ac7c04181ed6d2fe741e4ed7.tar.xz fence-agents-2d845bd16ad5bbc2ac7c04181ed6d2fe741e4ed7.zip |
Merging debian version 4.12.1-2~exp1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rwxr-xr-x | debian/tests/metadata | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/debian/tests/metadata b/debian/tests/metadata index 21c1ece..cf91d28 100755 --- a/debian/tests/metadata +++ b/debian/tests/metadata @@ -13,8 +13,12 @@ for agent in /usr/sbin/fence_*; do TESTXML=tests/data/metadata/${agent##*/}.xml if [ -f "$TESTXML" ]; then - gawk 'BEGIN {store=-1} /name=".*_path"/ || /name=".*_file"/ {store=2} {if (store!=0) {print}; store--}' "$TMPXML" \ - | diff -u "$TESTXML" - + if [ "$agent" = "/usr/sbin/fence_virt" ]; then + diff -u "$TESTXML" "$TMPXML" + else + gawk 'BEGIN {store=-1} /name=".*_path"/ || /name=".*_file"/ {store=2} {if (store!=0) {print}; store--}' "$TMPXML" \ + | diff -u "$TESTXML" - + fi fi xsltproc lib/fence2rng.xsl "$TMPXML" \ |