diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-03-13 17:42:08 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-03-13 17:42:08 +0100 |
| commit | 20da1c9e6d98879f61053404306e1c010919b021 (patch) | |
| tree | d422b615f82d47e45d01045fb607d7e5a744a08a | |
| parent | 88c565468c0c8bd7ef2cfefa66b88451d55fbb1a (diff) | |
| download | jenkins.debian.net-20da1c9e6d98879f61053404306e1c010919b021.tar.xz | |
reproducible: fix strange syntax error by triggering warnings instead
| -rwxr-xr-x | bin/reproducible_build.sh | 2 | ||||
| -rw-r--r-- | logparse/reproducible.rules | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index f8efd220..a2a12ac9 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -191,7 +191,7 @@ else # preserve RBUILDLOG as TMPLOG, then cleanup userContent from previous builds, # and then access RBUILDLOG with it's correct name (=eversion) TMPLOG=$(mktemp) - mv ${RBUILDLOG} ${TMPLOG} || { echo "Warning, package ${SRCPACKAGE} in ${SUITE} on ${ARCH} is probably already building elsewhere, exiting." ; echo "Warning, package ${SRCPACKAGE} in ${SUITE} on ${ARCH} is probably already building elsewhere, exiting." | mail -s "race condition found" qa-jenkins-scm@lists.alioth.debian.org ; exit 0 } + mv ${RBUILDLOG} ${TMPLOG} || { echo "Warning, package ${SRCPACKAGE} in ${SUITE} on ${ARCH} is probably already building elsewhere, exiting." ; exit 0 } cleanup_userContent RBUILDLOG=/var/lib/jenkins/userContent/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log mv ${TMPLOG} ${RBUILDLOG} diff --git a/logparse/reproducible.rules b/logparse/reproducible.rules index dcb928da..8350eece 100644 --- a/logparse/reproducible.rules +++ b/logparse/reproducible.rules @@ -12,3 +12,4 @@ warning /Warning: .+ could not be fully removed./ warning /Warning: could not download.+/ warning /Warning: the following failed builds have been found/ warning /Warning: cannot update html pages for.+/ +warning /Warning: package .+is probably already building elsewhere, exiting./ |