about summary refs log tree commit diff
path: root/src/libstore
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-01-25T12·42+0100
committerEelco Dolstra <edolstra@gmail.com>2017-01-26T19·40+0100
commitb1f001538e41a4f28e315baeede93a8fe70d6d62 (patch)
treefb31fc477d029d03f995c2f7301e9ae8ac3e063e /src/libstore
parent83ae6503e87c7f5237fb0f1602793c126436495a (diff)
Fix assertion failure when a path is locked
Fixes:

  nix-store: src/libstore/build.cc:3649: void nix::Worker::run(const Goals&): Assertion `!awake.empty()' failed.
Diffstat (limited to 'src/libstore')
-rw-r--r--src/libstore/pathlocks.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstore/pathlocks.cc b/src/libstore/pathlocks.cc
index 559737992798..bf7ad3d21851 100644
--- a/src/libstore/pathlocks.cc
+++ b/src/libstore/pathlocks.cc
@@ -136,6 +136,7 @@ bool PathLocks::lockPaths(const PathSet & _paths,
                         /* Failed to lock this path; release all other
                            locks. */
                         unlock();
+                        lockedPaths_.lock()->erase(lockPath);
                         return false;
                     }
                 }