aboutsummaryrefslogtreecommitdiff
path: root/src/libstore
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstore')
-rw-r--r--src/libstore/build/derivation-goal.cc2
-rw-r--r--src/libstore/build/entry-points.cc4
-rw-r--r--src/libstore/build/goal.hh4
-rw-r--r--src/libstore/build/worker.cc2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc
index 2638d7395..f2c8ccc5f 100644
--- a/src/libstore/build/derivation-goal.cc
+++ b/src/libstore/build/derivation-goal.cc
@@ -1545,7 +1545,7 @@ Goal::Finished DerivationGoal::done(
return Finished{
.result = buildResult.success() ? ecSuccess : ecFailed,
- .ex = ex ? std::make_unique<Error>(std::move(*ex)) : nullptr,
+ .ex = ex ? std::make_shared<Error>(std::move(*ex)) : nullptr,
.permanentFailure = buildResult.status == BuildResult::PermanentFailure,
.timedOut = buildResult.status == BuildResult::TimedOut,
.hashMismatch = anyHashMismatchSeen,
diff --git a/src/libstore/build/entry-points.cc b/src/libstore/build/entry-points.cc
index c6955600e..f52f2876f 100644
--- a/src/libstore/build/entry-points.cc
+++ b/src/libstore/build/entry-points.cc
@@ -16,13 +16,13 @@ void Store::buildPaths(const std::vector<DerivedPath> & reqs, BuildMode buildMod
worker.run(goals);
StringSet failed;
- std::optional<Error> ex;
+ std::shared_ptr<Error> ex;
for (auto & i : goals) {
if (i->ex) {
if (ex)
logError(i->ex->info());
else
- ex = std::move(*i->ex);
+ ex = i->ex;
}
if (i->exitCode != Goal::ecSuccess) {
if (auto i2 = dynamic_cast<DerivationGoal *>(i.get()))
diff --git a/src/libstore/build/goal.hh b/src/libstore/build/goal.hh
index 4ff4a14f8..1bfea8231 100644
--- a/src/libstore/build/goal.hh
+++ b/src/libstore/build/goal.hh
@@ -118,7 +118,7 @@ public:
};
struct [[nodiscard]] Finished {
ExitCode result;
- std::unique_ptr<Error> ex;
+ std::shared_ptr<Error> ex;
bool permanentFailure = false;
bool timedOut = false;
bool hashMismatch = false;
@@ -141,7 +141,7 @@ public:
/**
* Exception containing an error message, if any.
*/
- std::unique_ptr<Error> ex;
+ std::shared_ptr<Error> ex;
explicit Goal(Worker & worker)
: worker(worker)
diff --git a/src/libstore/build/worker.cc b/src/libstore/build/worker.cc
index 4a70b272a..1b4633e64 100644
--- a/src/libstore/build/worker.cc
+++ b/src/libstore/build/worker.cc
@@ -150,7 +150,7 @@ void Worker::goalFinished(GoalPtr goal, Goal::Finished & f)
if (!goal->waiters.empty())
logError(f.ex->info());
else
- goal->ex = std::move(f.ex);
+ goal->ex = f.ex;
}
for (auto & i : goal->waiters) {