From: František Dvořák <valtri@civ.zcu.cz>
Date: Sat, 7 Jul 2012 10:43:07 +0000 (+0000)
Subject: Tuning text output of package complince checks.
X-Git-Tag: gridsite-core_R_1_7_22~35
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=cc098d699e5d94c37e7316bfb9fccfbecafe4437;p=jra1mw.git

Tuning text output of package complince checks.
---

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 "<pre>$out</pre>"
+			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 "<pre>$out</pre>"
+		else
+			echo "$out"
+		fi
+		printf "${lf}\n"
 		if echo $out | grep -i '^E:' >/dev/null; then
 			ret=1
 		fi