diff options
| author | Mattia Rizzolo <mattia@debian.org> | 2017-09-08 11:01:53 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2017-09-09 14:26:20 +0200 |
| commit | ad48e93bc2bb9d5984f87c24e5e30d0b58910106 (patch) | |
| tree | 9a27c6e492274f43c629319b14f10a265867753d /bin | |
| parent | 5649bf3534145e4c6adab8482b6bd2959ea08aac (diff) | |
| download | jenkins.debian.net-ad48e93bc2bb9d5984f87c24e5e30d0b58910106.tar.xz | |
reproducible debian: simplify conditions
* at that point we already know that SAVE_ARTIFACTS=0 (well we know != 1, but
0 is the only other value)
* avoid nested if while still checkin for the same value
pondering a `case` statement here…
Signed-off-by: Mattia Rizzolo <mattia@debian.org>
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/reproducible_build.sh | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index d9265fc2..c252664b 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -101,17 +101,16 @@ save_artifacts() { cleanup_all() { echo "Starting cleanup." if [ "$SAVE_ARTIFACTS" = "1" ] ; then - save_artifacts - elif [ "$NOTIFY" = "2" ] && [ "$SAVE_ARTIFACTS" = "0" ] ; then + save_artifacts # this will also notify IRC as needed + elif [ "$NOTIFY" = "2" ] ; then irc_message debian-reproducible "$DEBIAN_URL/$SUITE/$ARCH/$SRCPACKAGE done: $STATUS debug: $NOTIFY" - elif [ "$NOTIFY" = "1" ] && [ "$SAVE_ARTIFACTS" = "0" ] ; then + elif [ "$NOTIFY" = "1" ] ; then irc_message debian-reproducible "$DEBIAN_URL/$SUITE/$ARCH/$SRCPACKAGE done: $STATUS" - elif [ ! -z "$NOTIFY" ] && [ "$SAVE_ARTIFACTS" = "0" ] ; then - if [ "$NOTIFY" = "diffoscope" ] ; then + elif [ "$NOTIFY" = "diffoscope" ] ; then irc_message debian-reproducible-changes "$DEBIAN_URL/$SUITE/$ARCH/$SRCPACKAGE $STATUS and $DIFFOSCOPE failed" - else - irc_message debian-reproducible-changes "$DEBIAN_URL/$SUITE/$ARCH/$SRCPACKAGE done: $STATUS debug: $NOTIFY" - fi + elif [ ! -z "$NOTIFY" ] ; then + # a weird value of $NOTIFY that we don't know about + irc_message debian-reproducible-changes "$DEBIAN_URL/$SUITE/$ARCH/$SRCPACKAGE done: $STATUS debug: $NOTIFY" fi [ ! -f $RBUILDLOG ] || gzip -9fvn $RBUILDLOG if [ "$MODE" = "master" ] ; then |