From b1f001538e41a4f28e315baeede93a8fe70d6d62 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 25 Jan 2017 13:42:07 +0100
Subject: 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.
---
 src/libstore/pathlocks.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/libstore/pathlocks.cc')

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;
                     }
                 }
-- 
cgit 1.4.1