grahamc/hydra2 - Change J4C4V6GLQUZLVB4JPPDS233YI2MPP6LT3WALHWBXOKRKNKRTWSWQC

Check if we want to send email for a build before iterating through its users

Signed-off-by: Shea Levy <shea@shealevy.com>

Created by Shea Levy on July 5, 2013

J4C4V6GLQUZLVB4JPPDS233YI2MPP6LT3WALHWBXOKRKNKRTWSWQC

Dependencies

In channels

main

Change contents

Replacement in src/lib/Hydra/Plugin/EmailNotification.pm at line 55 [4.21]

∅:D[2.866] → [3.910:1006]

B:BD[3.910] → [3.910:1006]

        my $to = $b->jobset->emailoverride ne "" ? $b->jobset->emailoverride : $b->maintainers;

[2.866]

[4.783]

        # Do we want to send mail for this build?
        unless ($ENV{'HYDRA_FORCE_SEND_MAIL'}) {
            next unless $b->jobset->enableemail;

Replacement in src/lib/Hydra/Plugin/EmailNotification.pm at line 59 [4.21]

B:BD[4.784] → [3.1007:1092]

        foreach my $address (split ",", $to) {
            $address = trim $address;

[4.784]

[3.1092]

            # If build is cancelled or aborted, do not send email.
            next if $b->buildstatus == 4 || $b->buildstatus == 3;

Replacement in src/lib/Hydra/Plugin/EmailNotification.pm at line 62 [4.21]

B:BD[3.1093] → [3.1093:1253]

            # Do we want to send mail for this build?
            unless ($ENV{'HYDRA_FORCE_SEND_MAIL'}) {
                next unless $b->jobset->enableemail;

[3.1093]

[4.1174]

            # If there is a previous (that is not cancelled or aborted) build
            # with same buildstatus, do not send email.
            next if defined $prevBuild && ($b->buildstatus == $prevBuild->buildstatus);
        }

Replacement in src/lib/Hydra/Plugin/EmailNotification.pm at line 67 [4.21]

B:BD[4.1175] → [3.1254:1395]

                # If build is cancelled or aborted, do not send email.
                next if $b->buildstatus == 4 || $b->buildstatus == 3;

[4.1175]

[4.1372]

        my $to = $b->jobset->emailoverride ne "" ? $b->jobset->emailoverride : $b->maintainers;

Replacement in src/lib/Hydra/Plugin/EmailNotification.pm at line 69 [4.21]

B:BD[4.1373] → [3.1396:1644]

                # If there is a previous (that is not cancelled or aborted) build
                # with same buildstatus, do not send email.
                next if defined $prevBuild && ($b->buildstatus == $prevBuild->buildstatus);
            }

[4.1373]

[4.1508]

        foreach my $address (split ",", $to) {
            $address = trim $address;