From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Mon, 12 Nov 2012 10:32:21 +0000 (+0000)
Subject: Fixed output of issue and platform (broken on Debian)
X-Git-Tag: emi-canl-c_R_2_0_2_1~5
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=dcf90f05b9277191e305cb6dc3bc87101a03964e;p=jra1mw.git

Fixed output of issue and platform (broken on Debian)
---

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh b/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh
index b8573ae..ead070d 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh
@@ -186,8 +186,11 @@ function gen_deployment_header()
 DURATION=`expr $1 - $2`
 SCENARIO="$3"
 
-ISSUE=`cat /etc/issue | head -n 1`
+ISSUE=`cat /etc/issue | head -n 1 | sed -r 's/[\\\r].*$//'`
 PLATFORM=`uname -i`
+if [ "$PLATFORM" == "unknown" ]; then
+    PLATFORM="`uname -sr`"
+fi
 TESTBED=`hostname -f`
 DISTRO=`cat /etc/issue | head -n 1 | sed 's/\s.*$//'`
 VERSION=`cat /etc/issue | head -n 1 | grep -E -o "[0-9]+\.[0-9]+"`