From 90c9b5dd600456e0adc1c4303577bbfc67f41a5e Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 6 Aug 2012 00:00:07 +0200 Subject: [PATCH] Do not send emails when build is cancelled/aborted. Also, ignore aborted/cancelled builds in comparing to previous build. --- src/script/hydra-build | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/script/hydra-build b/src/script/hydra-build index d21c2d2a..bc713c05 100755 --- a/src/script/hydra-build +++ b/src/script/hydra-build @@ -89,17 +89,16 @@ sub sendEmailNotification { , system => $build->system , finished => 1 , id => { '<', $build->id } + , -not => { buildstatus => { -in => [4, 3]} } }, { order_by => ["id DESC"] } ); - # if there is a previous build with same buildstatus, do not send email - if (defined $prevBuild && ($build->buildstatus == $prevBuild->buildstatus)) { + # if build is cancelled or aborted, do not send email + if ($build->buildstatus == 4 || $build->buildstatus == 3) { return; } - - # if buildstatus of this build or the previous one is aborted, do - # not send email - if ($build->buildstatus == 3 || (defined $prevBuild && ($prevBuild->buildstatus == 3))) { + # if there is a previous (that is not cancelled or aborted) build with same buildstatus, do not send email + if (defined $prevBuild && ($build->buildstatus == $prevBuild->buildstatus)) { return; }