grahamc/hydra2 - Change AS5PAYLIRJWB4JGU6N7WKILONGDIGCKNKS4ZSLRYCNGMUAP3AQSAC

Created by Eelco Dolstra on November 12, 2008

AS5PAYLIRJWB4JGU6N7WKILONGDIGCKNKS4ZSLRYCNGMUAP3AQSAC

Dependencies

In channels

main

Change contents

Insertion in src/HydraFrontend/lib/HydraFrontend/Controller/Root.pm at line 142 [4.804]

[3.491]


    return error($c, "Build step $stepnr of build $id does not have a log file.") if $step->logfile eq "";

Replacement in src/HydraFrontend/root/build.tt at line 150 [4.7350]

B:BD[3.4214] → [3.4214:4261]

          Build of <tt>[% step.outpath %]</tt>

[3.4214]

[3.4261]

          [% IF step.type == 0 %]
            Build of <tt>[% step.outpath %]</tt>
          [% ELSE %]
            Substitution of <tt>[% step.outpath %]</tt>
          [% END %]

Replacement in src/HydraFrontend/root/build.tt at line 171 [4.7350]

B:BD[3.4537] → [3.4537:4615]

          (<a href="[% c.uri_for('/nixlog' build.id step.stepnr) %]">log</a>)

[3.4537]

[3.4615]

          [% IF step.logfile %]
            (<a href="[% c.uri_for('/nixlog' build.id step.stepnr) %]">log</a>)
          [% END %]

Deletion in src/build.pl at line 50 [5.2912]
B:BD[3.5341] → [3.5341:5376]
```
            print STDERR "GOT $_";
```

Replacement in src/build.pl at line 66 [5.2912]

B:BD[3.5925] → [3.5925:5984]

            if (/^@\s+build-succeeded\s+(\S+)\s+(\S+)$/) {

[3.5925]

[3.5984]

            elsif (/^@\s+build-succeeded\s+(\S+)\s+(\S+)$/) {
                my $drvPath = $1;

Deletion in src/build.pl at line 69 [5.2912]
B:BD[3.6018] → [3.6018:6056]
```
                    my $drvPath = $1;
```

Replacement in src/build.pl at line 79 [5.2912]

B:BD[3.6390] → [3.6390:6461]

            if (/^@\s+build-failed\s+(\S+)\s+(\S+)\s+(\S+)\s+(.*)$/) {

[3.6390]

[3.6461]

            elsif (/^@\s+build-failed\s+(\S+)\s+(\S+)\s+(\S+)\s+(.*)$/) {
                my $drvPath = $1;

Deletion in src/build.pl at line 82 [5.2912]
B:BD[3.6495] → [3.6495:6533]
```
                    my $drvPath = $1;
```

Insertion in src/build.pl at line 106 [5.2912]

[2.3555]

[3.6873]

                });
            }
            elsif (/^@\s+substituter-started\s+(\S+)\s+(\S+)$/) {
                my $outPath = $1;
                $db->txn_do(sub {
                    $db->resultset('Buildsteps')->create(
                        { id => $build->id
                        , stepnr => $buildStepNr++
                        , type => 1 # = substitution
                        , outpath => $1
                        , busy => 1
                        , starttime => time
                        });
                });
            }
            elsif (/^@\s+substituter-succeeded\s+(\S+)$/) {
                my $outPath = $1;
                $db->txn_do(sub {
                    (my $step) = $db->resultset('Buildsteps')->search(
                        {id => $build->id, type => 1, outpath => $outPath}, {});
                    die unless $step;
                    $step->busy(0);
                    $step->status(0);
                    $step->stoptime(time);
                    $step->update;

Insertion in src/build.pl at line 135 [5.2912]

[3.6907]


            elsif (/^@\s+substituter-failed\s+(\S+)\s+(\S+)\s+(\S+)$/) {
                my $outPath = $1;
                $db->txn_do(sub {
                    (my $step) = $db->resultset('Buildsteps')->search(
                        {id => $build->id, type => 1, outpath => $outPath}, {});
                    die unless $step;
                    $step->busy(0);
                    $step->status(1);
                    $step->errormsg($3);
                    $step->stoptime(time);
                    $step->update;
                });
            }
            else {
                print STDERR "unknown Nix trace message: $_";
            }