Do not send emails when build is cancelled/aborted. Also, ignore aborted/cancelled builds in comparing to previous build.

This commit is contained in:
Rob Vermaas 2012-08-06 00:00:07 +02:00
parent aa8bf564e2
commit 90c9b5dd60

View file

@ -89,17 +89,16 @@ sub sendEmailNotification {
, system => $build->system , system => $build->system
, finished => 1 , finished => 1
, id => { '<', $build->id } , id => { '<', $build->id }
, -not => { buildstatus => { -in => [4, 3]} }
}, { order_by => ["id DESC"] } }, { order_by => ["id DESC"] }
); );
# if there is a previous build with same buildstatus, do not send email # if build is cancelled or aborted, do not send email
if (defined $prevBuild && ($build->buildstatus == $prevBuild->buildstatus)) { if ($build->buildstatus == 4 || $build->buildstatus == 3) {
return; return;
} }
# if there is a previous (that is not cancelled or aborted) build with same buildstatus, do not send email
# if buildstatus of this build or the previous one is aborted, do if (defined $prevBuild && ($build->buildstatus == $prevBuild->buildstatus)) {
# not send email
if ($build->buildstatus == 3 || (defined $prevBuild && ($prevBuild->buildstatus == 3))) {
return; return;
} }