grahamc/hydra2 - Change J4R2VCPPXW6QPVIDNXVHFRTDAZAPLAFBBBPIQZLZVPUHFXCO67TAC

Fix showing build steps in the machine status page

This was broken because of the comparison

step.machine.match('@(.*)').0 == m.key

where m.key contains the SSH user.

Also some style tweaks.

Created by Eelco Dolstra on April 23, 2013

J4R2VCPPXW6QPVIDNXVHFRTDAZAPLAFBBBPIQZLZVPUHFXCO67TAC

Dependencies

In channels

main

Change contents

Insertion in src/root/machine-status.tt at line 6 [5.8348]
[3.222]
[4.9525]
```
    [% name = m.key ? m.key.match('@(.*)').0 : "localhost" %]
```

Replacement in src/root/machine-status.tt at line 10 [5.8348]

B:BD[3.259] → [2.1400:1459]

          [% IF m.value.maxJobs > 0 %]
            Running

[3.259]

[3.416]

          [% IF !m.key || m.value.maxJobs %]
            Enabled:

Replacement in src/root/machine-status.tt at line 13 [5.8348]

B:BD[3.437] → [2.1460:1641]

            Stopped
          [% END %] <tt>[% m.key %]</tt> (<tt>[% comma=0; FOREACH system IN m.value.systemTypes %][% IF comma; %], [% ELSE; comma = 1; END; system; END %])</tt>

[3.437]

[3.729]

            Disabled:
          [% END %] <tt>[% name %]</tt>
          [% IF m.value.systemTypes %]
            ([% comma=0; FOREACH system IN m.value.systemTypes %][% IF comma; %], [% ELSE; comma = 1; END %]<tt>[% system %]</tt>[% END %])
          [% END %]

Replacement in src/root/machine-status.tt at line 24 [5.8348]

B:BD[3.811] → [2.1642:1698]

        [% IF step.machine.match('@(.*)').0 == m.key %]

[3.811]

[3.812]

        [% name2 = step.machine ? step.machine.match('@(.*)').0 : "localhost" %]
        [% IF name == name2 %]

Replacement in src/root/machine-status.tt at line 32 [5.8348]

B:BD[3.1215] → [3.1215:1316]

            <td class='right'>[% INCLUDE renderDuration duration = curTime - step.starttime %] </td>

[3.1215]

[3.1316]

            <td style="width: 10em">[% INCLUDE renderDuration duration = curTime - step.starttime %] </td>

Replacement in src/root/machine-status.tt at line 40 [5.8348]

B:BD[2.1863] → [2.1863:1915]

          <tr><td colspan="5">Never built</td></tr>

[2.1863]

[2.1915]

          <tr><td colspan="5">Never used</td></tr>

Deletion in src/root/machine-status.tt at line 47 [5.8348]
B:BD[4.10946] → [4.10946:10948]

Replacement in src/root/status.tt at line 17 [7.1151]

B:BD[6.5271] → [6.5271:5368]

        <td class='right'>[% INCLUDE renderDuration duration = curTime - step.starttime %] </td>

[6.5271]

[6.5368]

        <td style="width: 10em">[% INCLUDE renderDuration duration = curTime - step.starttime %] </td>