copyStorePath: Fix hash errors when copying from older store #2494
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
edolstra
reviewed
Oct 27, 2018
| }; | ||
| }; | ||
| MyStringSink sink(progress); | ||
| srcStore->narFromPath({storePath}, sink); |
There was a problem hiding this comment.
Note that this will cause the NAR to be copied twice (due to the later call to narFromPath). You could create a StringSource for sink.s and pass it to dstStore->addToStore().
BTW I think the whole progress stuff can be removed here since this is just a backward compatibility path.
This commit partially reverts 48662d1. 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.
FPtje
force-pushed
the
fix-copy-from-old
branch
from
84bea8d
to
49e272f
Compare
|
I've force pushed the following changes to the code:
I've tested by copying things to and from a Nix 1.11.7 store and to and from a nix 2.0.4 store. |
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit partially reverts 48662d1. 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.
From the Nixcon 2018 hackathon