about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorFalco Peijnenburg <fpeijnenburg@gmail.com>2018-10-27T16·12+0200
committerFalco Peijnenburg <fpeijnenburg@gmail.com>2018-10-29T19·24+0100
commit49e272f6472360ba952aa4fa62cc8e61a1b4d6b7 (patch)
tree95431119cd2b555056a5e7e5887057b3b8bd7f0a /src
parent18b4c53f71dfc626f5f5ffa0282afd1b9faad6a4 (diff)
copyStorePath: Fix hash errors when copying from older store
This commit partially reverts 48662d151bdf4a38670897beacea9d1bd750376a. When
copying from an older store (in my case a store running Nix 1.11.7), nix would
throw errors about there being no hash. This is fixed by recalculating the hash.
Diffstat (limited to 'src')
-rw-r--r--src/libstore/store-api.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 92e2685f7f66..dc54c735fdb1 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -588,15 +588,19 @@ void copyStorePath(ref<Store> srcStore, ref<Store> dstStore,
 
     uint64_t total = 0;
 
-    // FIXME
-#if 0
     if (!info->narHash) {
+        StringSink sink;
+        srcStore->narFromPath({storePath}, sink);
         auto info2 = make_ref<ValidPathInfo>(*info);
         info2->narHash = hashString(htSHA256, *sink.s);
         if (!info->narSize) info2->narSize = sink.s->size();
+        if (info->ultimate) info2->ultimate = false;
         info = info2;
+
+        StringSource source(*sink.s);
+        dstStore->addToStore(*info, source, repair, checkSigs);
+        return;
     }
-#endif
 
     if (info->ultimate) {
         auto info2 = make_ref<ValidPathInfo>(*info);