mirror of
https://github.com/NixOS/nix.git
synced 2025-12-05 16:41:01 +01:00
Move primeCache() to Worker::run()
We need the missing path info to communicate the worker's remaining goals to the progress bar.
This commit is contained in:
parent
5927624473
commit
3b7e00ce22
4 changed files with 24 additions and 39 deletions
|
|
@ -8,11 +8,8 @@ namespace nix {
|
|||
|
||||
class Worker;
|
||||
|
||||
class SubstitutionGoal : public Goal
|
||||
struct SubstitutionGoal : public Goal
|
||||
{
|
||||
friend class Worker;
|
||||
|
||||
private:
|
||||
/* The store path that should be realised through a substitute. */
|
||||
StorePath storePath;
|
||||
|
||||
|
|
@ -56,7 +53,6 @@ private:
|
|||
/* Content address for recomputing store path */
|
||||
std::optional<ContentAddress> ca;
|
||||
|
||||
public:
|
||||
SubstitutionGoal(const StorePath & storePath, Worker & worker, RepairFlag repair = NoRepair, std::optional<ContentAddress> ca = std::nullopt);
|
||||
~SubstitutionGoal();
|
||||
|
||||
|
|
@ -82,8 +78,6 @@ public:
|
|||
/* Callback used by the worker to write to the log. */
|
||||
void handleChildOutput(int fd, const string & data) override;
|
||||
void handleEOF(int fd) override;
|
||||
|
||||
StorePath getStorePath() { return storePath; }
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue