summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/reproducible_html_archlinux.sh24
1 files changed, 4 insertions, 20 deletions
diff --git a/bin/reproducible_html_archlinux.sh b/bin/reproducible_html_archlinux.sh
index 83ad1f81..aa076c7e 100755
--- a/bin/reproducible_html_archlinux.sh
+++ b/bin/reproducible_html_archlinux.sh
@@ -46,19 +46,11 @@ for REPOSITORY in $ARCHLINUX_REPOS ; do
echo " <td>$PKG</td>" >> $HTML_BUFFER
echo " <td>" >> $HTML_BUFFER
if [ -z "$(cd $ARCHBASE/$REPOSITORY/$PKG/ ; ls *.pkg.tar.xz.html 2>/dev/null)" ] ; then
- if [ ! -z "$(grep '==> ERROR: Could not resolve all dependencies' $ARCHBASE/$REPOSITORY/$PKG/build1.log)" ] ; then
+ if [ ! -z "$(grep '(==> ERROR: Could not resolve all dependencies|==> ERROR: .pacman. failed to install missing dependencies)' $ARCHBASE/$REPOSITORY/$PKG/build1.log)" ] ; then
HTML_TARGET=$HTML_DEPWAIT
let NR_DEPWAIT+=1
echo " <img src=\"/userContent/static/weather-snow.png\" alt=\"depwait icon\" /> could not resolve dependencies" >> $HTML_BUFFER
- elif [ ! -z "$(egrep '==> ERROR: .pacman. failed to install missing dependencies.' $ARCHBASE/$REPOSITORY/$PKG/build1.log)" ] ; then
- HTML_TARGET=$HTML_DEPWAIT
- let NR_DEPWAIT+=1
- echo " <img src=\"/userContent/static/weather-snow.png\" alt=\"depwait icon\" /> failed to install dependencies" >> $HTML_BUFFER
- elif [ ! -z "$(egrep '==> ERROR: Failure while downloading' $ARCHBASE/$REPOSITORY/$PKG/build1.log)" ] ; then
- HTML_TARGET=$HTML_404
- let NR_404+=1
- echo " <img src=\"/userContent/static/weather-severe-alert.png\" alt=\"404 icon\" /> failed to download source" >> $HTML_BUFFER
- elif [ ! -z "$(egrep '==> ERROR: One or more PGP signatures could not be verified' $ARCHBASE/$REPOSITORY/$PKG/build1.log)" ] ; then
+ elif [ ! -z "$(egrep '(==> ERROR: Failure while downloading|==> ERROR: One or more PGP signatures could not be verified)' $ARCHBASE/$REPOSITORY/$PKG/build1.log)" ] ; then
HTML_TARGET=$HTML_404
let NR_404+=1
EXTRA_REASON=""
@@ -66,22 +58,14 @@ for REPOSITORY in $ARCHLINUX_REPOS ; do
EXTRA_REASON="(unknown public key)"
fi
echo " <img src=\"/userContent/static/weather-severe-alert.png\" alt=\"404 icon\" /> failed to verify source with PGP signatures $EXTRA_REASON" >> $HTML_BUFFER
- elif [ ! -z "$(egrep '==> ERROR: One or more files did not pass the validity check' $ARCHBASE/$REPOSITORY/$PKG/build1.log)" ] ; then
+ elif [ ! -z "$(egrep '(==> ERROR: One or more files did not pass the validity check|makepkg was killed by timeout after)' $ARCHBASE/$REPOSITORY/$PKG/build1.log)" ] ; then
HTML_TARGET=$HTML_FTBFS
let NR_FTBFS+=1
echo " <img src=\"/userContent/static/weather-storm.png\" alt=\"ftbfs icon\" /> failed to verify source" >> $HTML_BUFFER
- elif [ ! -z "$(egrep '==> ERROR: A failure occurred in (build|package)' $ARCHBASE/$REPOSITORY/$PKG/build1.log)" ] ; then
+ elif [ ! -z "$(egrep '==> ERROR: A failure occurred in (build|package|check)' $ARCHBASE/$REPOSITORY/$PKG/build1.log)" ] ; then
HTML_TARGET=$HTML_FTBFS
let NR_FTBFS+=1
echo " <img src=\"/userContent/static/weather-storm.png\" alt=\"ftbfs icon\" /> failed to build from source" >> $HTML_BUFFER
- elif [ ! -z "$(egrep '==> ERROR: A failure occurred in check' $ARCHBASE/$REPOSITORY/$PKG/build1.log)" ] ; then
- HTML_TARGET=$HTML_FTBFS
- let NR_FTBFS+=1
- echo " <img src=\"/userContent/static/weather-storm.png\" alt=\"ftbfs icon\" /> failed to build from source, while running tests" >> $HTML_BUFFER
- elif [ ! -z "$(egrep 'makepkg was killed by timeout after' $ARCHBASE/$REPOSITORY/$PKG/build1.log)" ] ; then
- HTML_TARGET=$HTML_FTBFS
- let NR_FTBFS+=1
- echo " <img src=\"/userContent/static/weather-storm.png\" alt=\"ftbfs icon\" /> failed to build, killed by timeout" >> $HTML_BUFFER
else
echo " probably failed to build from source, please investigate" >> $HTML_BUFFER
HTML_TARGET=$HTML_UNKNOWN