grahamc/hydra2 - Change JWFZGHKPRS2JUAUQT7MRXMDPZOFBCJM4BRFT5D3WC7M6Y5JY5CVQC

Jobset eval page: Fix handling of aborted/cancelled builds

The fix in 85d51074 was not quite right.

Created by Eelco Dolstra on January 15, 2014

JWFZGHKPRS2JUAUQT7MRXMDPZOFBCJM4BRFT5D3WC7M6Y5JY5CVQC

Dependencies

In channels

main

Change contents

Replacement in src/lib/Hydra/Controller/JobsetEval.pm at line 85 [3.1302]

B:BD[3.2660] → [2.0:173]

        if ($build->finished != 0 && ($build->buildstatus == 3 || $build->buildstatus == 4)) {
            push @{$c->stash->{aborted}}, $build;
            next;
        }

[3.2660]

        my $aborted = $build->finished != 0 && ($build->buildstatus == 3 || $build->buildstatus == 4);

Replacement in src/lib/Hydra/Controller/JobsetEval.pm at line 95 [3.1302]

B:BD[4.1558] → [2.174:245]

                if ($build->finished == 0 || $build2->finished == 0) {

[4.1558]

[5.106]

                if ($aborted) {
                    # do nothing
                } elsif ($build->finished == 0 || $build2->finished == 0) {

Replacement in src/lib/Hydra/Controller/JobsetEval.pm at line 113 [3.1302]

B:BD[3.3840] → [4.1559:1612]

        push @{$c->stash->{new}}, $build if !$found;

[3.3840]

        if ($aborted) {
            push @{$c->stash->{aborted}}, $build;
        } else {
            push @{$c->stash->{new}}, $build if !$found;
        }