Merge pull request #5713 from tweag/balsoft/another-follows-bugfix

Flakes: computeLocks: pass correct LockParent when reusing oldLock
2021-12-02 13:17:50 +01:00
parent 77b3e4b4ee 8cbf862e6f
commit 2ff71b0213
2 changed files with 18 additions and 1 deletions
@@ -480,11 +480,16 @@ LockedFlake lockFlake(
                            }
                        }

+                        LockParent newParent {
+                            .path = inputPath,
+                            .absolute = false
+                        };
+
                        computeLocks(
                            mustRefetch
                            ? getFlake(state, oldLock->lockedRef, false, flakeCache).inputs
                            : fakeInputs,
-                            childNode, inputPath, oldLock, parent, parentPath);
+                            childNode, inputPath, oldLock, newParent, parentPath);

                    } else {
                        /* We need to create a new lock file entry. So fetch