From c137c0a5ebc0d58c53f86986ab66967ac8629cbe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 25 Aug 2017 17:49:40 +0200
Subject: Allow activities to be nested

In particular, this allows more relevant activities ("substituting X")
to supersede inferior ones ("downloading X").
---
 src/libstore/download.hh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/libstore/download.hh')

diff --git a/src/libstore/download.hh b/src/libstore/download.hh
index 7d8982d64c4c..752bf3723cfc 100644
--- a/src/libstore/download.hh
+++ b/src/libstore/download.hh
@@ -16,8 +16,10 @@ struct DownloadRequest
     bool head = false;
     size_t tries = 5;
     unsigned int baseRetryTimeMs = 250;
+    ActivityId parentAct;
 
-    DownloadRequest(const std::string & uri) : uri(uri) { }
+    DownloadRequest(const std::string & uri)
+        : uri(uri), parentAct(curActivity) { }
 };
 
 struct DownloadResult
-- 
cgit 1.4.1