aboutsummaryrefslogtreecommitdiff
path: root/src/libexpr
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2020-06-05 20:52:23 +0200
committerEelco Dolstra <edolstra@gmail.com>2020-06-05 20:52:23 +0200
commit9ef6048d784a298f384affdec941b5b38c61346c (patch)
treeefe52cd2d4b1adf1ca6893aa7f7a3e8c89ef0bc0 /src/libexpr
parent488ff83e6b5b3120ce100b0f7b065280f2ce30c2 (diff)
diffLockFiles(): Fix assertion failure
There are some cases where this inequality didn't hold, in particular due to the Input / TreeInfo merge, where we're not always showing narHash.
Diffstat (limited to 'src/libexpr')
-rw-r--r--src/libexpr/flake/lockfile.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libexpr/flake/lockfile.cc b/src/libexpr/flake/lockfile.cc
index 68e587650..f26baa697 100644
--- a/src/libexpr/flake/lockfile.cc
+++ b/src/libexpr/flake/lockfile.cc
@@ -243,7 +243,6 @@ std::string diffLockFiles(const LockFile & oldLocks, const LockFile & newLocks)
++i;
} else {
if (!(i->second->lockedRef == j->second->lockedRef)) {
- assert(i->second->lockedRef.to_string() != j->second->lockedRef.to_string());
res += fmt("* Updated '%s': '%s' -> '%s'\n",
concatStringsSep("/", i->first),
i->second->lockedRef,