nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-26 04:00:59 +01:00
Code Activity

* Cygwin compatibility (Cygwin can't upgrade read locks to write

Browse source 
locks, it deadlocks when you try to do that).
This commit is contained in:
Eelco Dolstra 2008-04-10 06:53:16 +00:00
parent a599708b7a
commit f83f764218
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libstore/local-store.cc
View file

@ -49,8 +49,7 @@ LocalStore::LocalStore()
checkStoreNotSymlink(); checkStoreNotSymlink();
Path globalLockPath = nixDBPath + "/big-lock"; Path globalLockPath = nixDBPath + "/big-lock";
globalLock = open(globalLockPath.c_str(), O_RDWR | O_CREAT, 0666); globalLock = openLockFile(globalLockPath.c_str(), true);
if (globalLock == -1) throw SysError(format("opening file `%1%'") % globalLockPath);
if (!lockFile(globalLock, ltRead, false)) { if (!lockFile(globalLock, ltRead, false)) {
printMsg(lvlError, "waiting for the big Nix store lock..."); printMsg(lvlError, "waiting for the big Nix store lock...");

5
src/libstore/upgrade-schema.cc
View file

@ -22,6 +22,11 @@ void LocalStore::upgradeStore12()
{ {
#if OLD_DB_COMPAT #if OLD_DB_COMPAT
#ifdef __CYGWIN__
/* Cygwin can't upgrade a read lock to a write lock... */
lockFile(globalLock, ltNone, true);
#endif
if (!lockFile(globalLock, ltWrite, false)) { if (!lockFile(globalLock, ltWrite, false)) {
printMsg(lvlError, "waiting for exclusive access to the Nix store..."); printMsg(lvlError, "waiting for exclusive access to the Nix store...");
lockFile(globalLock, ltWrite, true); lockFile(globalLock, ltWrite, true);