[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [patch] buildcross trivial cleanup



Fix a few more test(1) invocations


PS: the em_cross.sh hunk will only apply with a bit of an offset since i
wiped packages that are on my personal blacklist, such as
outdated autoconf or outdated automake.

Also, current sid (i.e. unstable) doesn't have grep-dctrl anymore:

+ apt-get -y --force-yes install grep-dctrl
Reading package lists...
Building dependency tree...
Reading state information...
Note, selecting dctrl-tools instead of grep-dctrl
dctrl-tools is already the newest version.

so i wiped that one too and re-enabled dctrl-tools instead, fwiw.
This change as well as the other package-changes mentioned above are
*not* in this patchlet.
Index: buildcross/branch/em_cross.sh
===================================================================
--- buildcross/branch/em_cross.sh	(revision 3276)
+++ buildcross/branch/em_cross.sh	(working copy)
@@ -12,7 +12,7 @@
 PKG=$1
 ARCH=$2
 
-if [ ${ARCH} == "armel" ]; then
+if [ "X$ARCH" == "Xarmel" ]; then
 	MIRROR=${MIRROR:="http://ftp.gnuab.org/debian/"}
 
 fi
@@ -451,7 +450,7 @@
 	# REPLACE: This quite does not work
 	# echo 0 >> $LOGPATH/$HOST-$ARCH-$PKG.log
 	TEST=`cat $LOGPATH/$HOST-$ARCH-$PKG.log | grep $HOST.deb`
-	if [ -n ${TEST} ]; then
+	if [ -n "$TEST" ]; then
 	 	echo 1 >> $LOGPATH/$HOST-$ARCH-$PKG.log
 	else
 	 	echo 0 >> $LOGPATH/$HOST-$ARCH-$PKG.log
Index: buildcross/branch/em_log.sh
===================================================================
--- buildcross/branch/em_log.sh	(revision 3276)
+++ buildcross/branch/em_log.sh	(working copy)
@@ -10,10 +10,16 @@
 
 # Check logs - Need to be improved, it does not work fine.
 VAR=`tail -n 1 $LOGPATH/$HOST-$ARCH-$PKG.log`
+# Failed?
+if [ "x$VAR" = "x" ]; then
+  VAR=1
+else
+  VAR=0
+fi
 
 # Maybe show logfile on the html
 
-if [ $VAR == 0 ]; then
+if [ $VAR -eq 0 ]; then
 	echo "Build successful"
 	echo " &nbsp; $HOST : $ARCH : $SUITE : $PKG : <a href="$LOGPATH/$HOST-$ARCH-$PKG.log">LOGFILE</a> : <b> Build successful </b> <br>" >> $LOGHTMLPATH/$LOGHTML
 else

Reply to: