From 8cf158b7a9fc47a5621a34ae58514d0ca3c2cf6c Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 23 Oct 2021 22:23:29 -0400
Subject: [PATCH] Revert "Fix unhelpful error messages in aggregate jobs."

---
 src/hydra-eval-jobs/hydra-eval-jobs.cc | 86 ++++++++++----------------
 1 file changed, 33 insertions(+), 53 deletions(-)

diff --git a/src/hydra-eval-jobs/hydra-eval-jobs.cc b/src/hydra-eval-jobs/hydra-eval-jobs.cc
index 95dde285..f50ac5e5 100644
--- a/src/hydra-eval-jobs/hydra-eval-jobs.cc
+++ b/src/hydra-eval-jobs/hydra-eval-jobs.cc
@@ -438,65 +438,45 @@ int main(int argc, char * * argv)
         for (auto i = state->jobs.begin(); i != state->jobs.end(); ++i) {
             auto jobName = i.key();
             auto & job = i.value();
-            // For the error message
-            std::string lastTriedJobName = i.key();
 
             auto named = job.find("namedConstituents");
             if (named == job.end()) continue;
 
-            try {
-                if (myArgs.dryRun) {
-                    for (std::string jobName2 : *named) {
-                        lastTriedJobName = jobName2;
-                        auto job2 = state->jobs.find(jobName2);
-                        if (job2 == state->jobs.end())
-                            throw Error("aggregate job '%s' references non-existent job '%s'", jobName, jobName2);
-                        std::string drvPath2 = (*job2)["drvPath"];
-                        job["constituents"].push_back(drvPath2);
-                    }
-                } else {
-                    auto drvPath = store->parseStorePath((std::string) job["drvPath"]);
-                    auto drv = store->readDerivation(drvPath);
-
-                    for (std::string jobName2 : *named) {
-                        lastTriedJobName = jobName2;
-                        auto job2 = state->jobs.find(jobName2);
-                        if (job2 == state->jobs.end())
-                            throw Error("aggregate job '%s' references non-existent job '%s'", jobName, jobName2);
-
-                        if ((*job2).find("error") != (*job2).end()) {
-                            if (job.find("error") == job.end()) {
-                                job["error"] = fmt("Errors aggregating aggregate job '%1%'.\n", jobName);
-                            }
-                            job["error"] = fmt("While handling '%1%': %2%\n", jobName2, (std::string) (*job2)["error"]);
-                        } else {
-                            auto drvPath2 = store->parseStorePath((std::string) (*job2)["drvPath"]);
-                            auto drv2 = store->readDerivation(drvPath2);
-                            job["constituents"].push_back(store->printStorePath(drvPath2));
-                            drv.inputDrvs[drvPath2] = {drv2.outputs.begin()->first};
-                        }
-                    }
-
-                    std::string drvName(drvPath.name());
-                    assert(hasSuffix(drvName, drvExtension));
-                    drvName.resize(drvName.size() - drvExtension.size());
-                    auto h = std::get<Hash>(hashDerivationModulo(*store, drv, true));
-                    auto outPath = store->makeOutputPath("out", h, drvName);
-                    drv.env["out"] = store->printStorePath(outPath);
-                    drv.outputs.insert_or_assign("out", DerivationOutput { .output = DerivationOutputInputAddressed { .path = outPath } });
-                    auto newDrvPath = store->printStorePath(writeDerivation(*store, drv));
-
-                    debug("rewrote aggregate derivation %s -> %s", store->printStorePath(drvPath), newDrvPath);
-
-                    job["drvPath"] = newDrvPath;
-                    job["outputs"]["out"] = store->printStorePath(outPath);
+            if (myArgs.dryRun) {
+                for (std::string jobName2 : *named) {
+                    auto job2 = state->jobs.find(jobName2);
+                    if (job2 == state->jobs.end())
+                        throw Error("aggregate job '%s' references non-existent job '%s'", jobName, jobName2);
+                    std::string drvPath2 = (*job2)["drvPath"];
+                    job["constituents"].push_back(drvPath2);
                 }
-            } catch (std::exception & e) {
-                // Print more information to help debugging.
-                printError("Unexpected error in hydra-eval-jobs when handling job '%s', when producing aggregate job '%s':", lastTriedJobName, jobName);
+            } else {
+                auto drvPath = store->parseStorePath((std::string) job["drvPath"]);
+                auto drv = store->readDerivation(drvPath);
 
-                // And throw the original exception!
-                throw;
+                for (std::string jobName2 : *named) {
+                    auto job2 = state->jobs.find(jobName2);
+                    if (job2 == state->jobs.end())
+                        throw Error("aggregate job '%s' references non-existent job '%s'", jobName, jobName2);
+                    auto drvPath2 = store->parseStorePath((std::string) (*job2)["drvPath"]);
+                    auto drv2 = store->readDerivation(drvPath2);
+                    job["constituents"].push_back(store->printStorePath(drvPath2));
+                    drv.inputDrvs[drvPath2] = {drv2.outputs.begin()->first};
+                }
+
+                std::string drvName(drvPath.name());
+                assert(hasSuffix(drvName, drvExtension));
+                drvName.resize(drvName.size() - drvExtension.size());
+                auto h = std::get<Hash>(hashDerivationModulo(*store, drv, true));
+                auto outPath = store->makeOutputPath("out", h, drvName);
+                drv.env["out"] = store->printStorePath(outPath);
+                drv.outputs.insert_or_assign("out", DerivationOutput { .output = DerivationOutputInputAddressed { .path = outPath } });
+                auto newDrvPath = store->printStorePath(writeDerivation(*store, drv));
+
+                debug("rewrote aggregate derivation %s -> %s", store->printStorePath(drvPath), newDrvPath);
+
+                job["drvPath"] = newDrvPath;
+                job["outputs"]["out"] = store->printStorePath(outPath);
             }
 
             job.erase("namedConstituents");