From cc098d699e5d94c37e7316bfb9fccfbecafe4437 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Sat, 7 Jul 2012 10:43:07 +0000 Subject: [PATCH] Tuning text output of package complince checks. --- org.glite.testsuites.ctb/LB/tests/lb-common.sh | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/org.glite.testsuites.ctb/LB/tests/lb-common.sh b/org.glite.testsuites.ctb/LB/tests/lb-common.sh index 244555c..5587556 100755 --- a/org.glite.testsuites.ctb/LB/tests/lb-common.sh +++ b/org.glite.testsuites.ctb/LB/tests/lb-common.sh @@ -368,13 +368,17 @@ function check_rpmlint() { local out='' local ret=0 - echo "Packages compliance check output:" + printf "Packages compliance check output:${lf}" while test -n "$1"; do for pkg in `rpm -qa --queryformat '%{NAME} ' $1`; do - echo $pkg + printf "$pkg${lf}" out="`rpmlint $pkg`" - echo "$out" - echo + if test -n "$is_html"; then + echo "
$out
" + else + echo "$out" + fi + printf "${lf}\n" if echo $out | grep -i '^E:' >/dev/null; then ret=1 fi @@ -426,9 +430,14 @@ $src" echo "Packages compliance check output:" for pkg in $pkgs; do - echo $pkg: + printf "$pkg:${lf}" out="`lintian $dir/${pkg}_*.dsc`" - echo "$out" + if test -n "$is_html"; then + echo "
$out
" + else + echo "$out" + fi + printf "${lf}\n" if echo $out | grep -i '^E:' >/dev/null; then ret=1 fi -- 1.8.2.3