From 93e819f1f69d84d3d63277a955b424b9c278d61c Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sat, 17 Oct 2015 15:40:59 +0200 Subject: reproducible arch: detect more types of failures --- bin/reproducible_html_archlinux.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/bin/reproducible_html_archlinux.sh b/bin/reproducible_html_archlinux.sh index 9aee0734..45e41096 100755 --- a/bin/reproducible_html_archlinux.sh +++ b/bin/reproducible_html_archlinux.sh @@ -48,13 +48,20 @@ for PKG in $(find $ARCHBASE/* -maxdepth 1 -type d -exec basename {} \;) ; do fi done if [ -z "$(cd $ARCHBASE/$PKG/ ; ls *.pkg.tar.xz.html 2>/dev/null)" ] ; then - if [ ! -z "$(grep 'ERROR: Could not resolve all dependencies' $ARCHBASE/$PKG/build1.log)" ] ; then + if [ ! -z "$(grep '==> ERROR: Could not resolve all dependencies' $ARCHBASE/$PKG/build1.log)" ] ; then write_page " could not resolve dependencies" - elif [ ! -z "$(egrep 'ERROR: .pacman. failed to install missing dependencies.' $ARCHBASE/$PKG/build1.log)" ] ; then + elif [ ! -z "$(egrep '==> ERROR: .pacman. failed to install missing dependencies.' $ARCHBASE/$PKG/build1.log)" ] ; then write_page " failed to install dependencies" - - else + elif [ ! -z "$(egrep '==> ERROR: A failure occurred in (build|package)' $ARCHBASE/$PKG/build1.log)" ] ; then write_page " failed to build from source" + elif [ ! -z "$(egrep '==> ERROR: A failure occurred in check' $ARCHBASE/$PKG/build1.log)" ] ; then + write_page " failed to build from source, when running tests" + elif [ ! -z "$(egrep '==> ERROR: Failure while downloading' $ARCHBASE/$PKG/build1.log)" ] ; then + write_page " failed to download source" + elif [ ! -z "$(egrep '==> ERROR: One or more files did not pass the validity check' $ARCHBASE/$PKG/build1.log)" ] ; then + write_page " failed to verify source" + else + write_page " probably failed to build from source, please investigate" fi else write_page " " -- cgit v1.2.3-70-g09d2