packages: chromium-browser/update-source.sh - report last 1000 lines of bui...

glen glen at pld-linux.org
Wed Mar 3 10:40:25 CET 2010


Author: glen                         Date: Wed Mar  3 09:40:25 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- report last 1000 lines of build log on failed autobuild

---- Files affected:
packages/chromium-browser:
   update-source.sh (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/chromium-browser/update-source.sh
diff -u packages/chromium-browser/update-source.sh:1.6 packages/chromium-browser/update-source.sh:1.7
--- packages/chromium-browser/update-source.sh:1.6	Tue Feb 23 01:08:59 2010
+++ packages/chromium-browser/update-source.sh	Wed Mar  3 10:40:19 2010
@@ -77,10 +77,32 @@
 		dist=$(rpm -E %{pld_release})
 		arch=$(rpm -E %{_host_cpu})
 		outdir=$(readlink -f $dir)/build-$dist-$arch
+		logfile=$outdir/$pkg.log
 		rpmdir=$outdir/RPMS
 		install -d $rpmdir
 
-		../builder -bb --clean --define '_enable_debug_packages 0' --define "_builddir $outdir" --define "_rpmdir $rpmdir" $specfile
+		# setup custom logfile via $HOME_ETC hack
+		# TODO: just add --logfile support for builder
+		cat > $outdir/.builderrc <<-EOF
+			if [ -n "$HOME_ETC" ]; then
+				. "$HOME_ETC/.builderrc"
+			else
+				. ~/.builderrc
+			fi
+			LOGFILE='$logfile'
+		EOF
+
+		> $logfile
+		HOME_ETC=$outdir \
+			../builder -bb --clean \
+			--define '_enable_debug_packages 0' \
+			--define "_builddir $outdir" \
+			--define "_rpmdir $rpmdir" \
+			$specfile || {
+			echo "Package build failed"
+			tail -n 1000 $logfile
+			exit 1
+		}
 
 		rpmdest=~/public_html/$dist/$arch/
 		if [ "$publish_packages" ] && [ "$(ls $rpmdir/*.rpm 2>/dev/null)" ]; then
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/update-source.sh?r1=1.6&r2=1.7&f=u



More information about the pld-cvs-commit mailing list