grahamc/hydra2 - Change FGUL3HAZDA6JGTAZNCJZIIKALZ4VMVTXYWFNSXWDYR5LXNGCO3RAC

hydra-eval-jobs: Don't go into an infinite recursion

The function getDerivation() can return false if its argument is a derivation. This happens if evaluating the name or system attribute triggers an assertion. In that case, we shouldn't recurse into the attributes of the derivation.

Created by Eelco Dolstra on October 4, 2012

FGUL3HAZDA6JGTAZNCJZIIKALZ4VMVTXYWFNSXWDYR5LXNGCO3RAC

Dependencies

In channels

main

Change contents

Replacement in src/c/hydra-eval-jobs.cc at line 19 [3.303]

B:BD[3.494] → [3.494:541]

    std::cout << "Syntax: eval-jobs <expr>\n";

[3.494]

[4.71]

    std::cout << "Syntax: hydra-eval-jobs <expr>\n";

Insertion in src/c/hydra-eval-jobs.cc at line 112 [3.303]
[5.1576]
[2.979]
```
    checkInterrupt();
```

Replacement in src/c/hydra-eval-jobs.cc at line 170 [3.303]

B:BD[4.1174] → [6.1774:1828]

B:BD[6.1828] → [2.981:1131]

            foreach (Bindings::iterator, i, *v.attrs)
                findJobs(state, doc, argsUsed, argsLeft, *i->value,
                    (attrPath.empty() ? "" : attrPath + ".") + (string) i->name);

[4.1174]

[4.1402]

            if (!state.isDerivation(v)) {
                foreach (Bindings::iterator, i, *v.attrs)
                    findJobs(state, doc, argsUsed, argsLeft, *i->value,
                        (attrPath.empty() ? "" : attrPath + ".") + (string) i->name);
            }

Replacement in src/c/hydra-eval-jobs.cc at line 268 [3.303]
B:BD[3.1023] → [3.1023:1055]
```
string programId = "eval-jobs";
```
[3.1023]
```
string programId = "hydra-eval-jobs";
```