diff options
| author | Holger Levsen <holger@layer-acht.org> | 2017-11-22 13:55:16 +0000 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2017-11-22 13:55:16 +0000 |
| commit | fd38103910ccfe40398194aea74e1b9fafa0a600 (patch) | |
| tree | 65d6b2b7479fed527179b17feb0fca50af4e6388 | |
| parent | 8e55f37d0ef8ce6b43ea3421c4601f531707182d (diff) | |
| download | jenkins.debian.net-fd38103910ccfe40398194aea74e1b9fafa0a600.tar.xz | |
reproducible Arch Linux: refactoring
Signed-off-by: Holger Levsen <holger@layer-acht.org>
| -rwxr-xr-x | bin/reproducible_html_archlinux.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/reproducible_html_archlinux.sh b/bin/reproducible_html_archlinux.sh index f5d2d92e..469c92ef 100755 --- a/bin/reproducible_html_archlinux.sh +++ b/bin/reproducible_html_archlinux.sh @@ -62,11 +62,11 @@ for REPOSITORY in $ARCHLINUX_REPOS ; do HTML_TARGET=${HTML_DEPWAIT[0]} let NR_DEPWAIT+=1 echo " <img src=\"/userContent/static/weather-snow.png\" alt=\"depwait icon\" /> could not resolve dependencies as there are conflicts" >> $HTML_BUFFER - elif [ ! -z "$(egrep '(==> ERROR: Could not resolve all dependencies|==> ERROR: .pacman. failed to install missing dependencies)' $ARCHLINUX_PKG_PATH/build1.log $ARCHLINUX_PKG_PATH/build2.log)" ] ; then + elif [ ! -z "$(egrep '==> ERROR: (Could not resolve all dependencies|.pacman. failed to install missing dependencies)' $ARCHLINUX_PKG_PATH/build1.log $ARCHLINUX_PKG_PATH/build2.log)" ] ; then HTML_TARGET=${HTML_DEPWAIT[1]} 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: Failure while downloading|==> ERROR: One or more PGP signatures could not be verified)' $ARCHLINUX_PKG_PATH/build1.log $ARCHLINUX_PKG_PATH/build2.log)" ] ; then + elif [ ! -z "$(egrep '==> ERROR: (Failure while downloading|One or more PGP signatures could not be verified)' $ARCHLINUX_PKG_PATH/build1.log $ARCHLINUX_PKG_PATH/build2.log)" ] ; then HTML_TARGET=${HTML_404[0]} EXTRA_REASON="" let NR_404+=1 @@ -97,7 +97,7 @@ for REPOSITORY in $ARCHLINUX_REPOS ; do HTML_TARGET=${HTML_FTBFS[0]} 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: install file .* does not exist or is not a regular file|==> ERROR: The download program wget is not installed|==> ERROR: \'pacman\' failed to install missing dependencies.)' $ARCHLINUX_PKG_PATH/build1.log)" ] ; then + elif [ ! -z "$(egrep '==> ERROR: (install file .* does not exist or is not a regular file|The download program wget is not installed)' $ARCHLINUX_PKG_PATH/build1.log)" ] ; then HTML_TARGET=${HTML_FTBFS[1]} let NR_FTBFS+=1 echo " <img src=\"/userContent/static/weather-storm.png\" alt=\"ftbfs icon\" /> failed to build, requirements not met" >> $HTML_BUFFER |