From 989176c56e1996a7df87bb501ad09aed1f3b395d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 18 Jul 2008 15:34:46 +0000 Subject: * Allow read-only access to the store (e.g., non-root users on NixOS can do operations like "nix-store -qR " even without the Nix daemon). --- src/libstore/local-store.cc | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 105f711228a8..d886ba558606 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -15,6 +15,7 @@ #include #include #include +#include namespace nix { @@ -48,8 +49,14 @@ LocalStore::LocalStore() checkStoreNotSymlink(); - Path globalLockPath = nixDBPath + "/big-lock"; - globalLock = openLockFile(globalLockPath.c_str(), true); + try { + Path globalLockPath = nixDBPath + "/big-lock"; + globalLock = openLockFile(globalLockPath.c_str(), true); + } catch (SysError & e) { + if (e.errNo != EACCES) throw; + readOnlyMode = true; + return; + } if (!lockFile(globalLock, ltRead, false)) { printMsg(lvlError, "waiting for the big Nix store lock..."); @@ -59,9 +66,6 @@ LocalStore::LocalStore() createDirs(nixDBPath + "/info"); createDirs(nixDBPath + "/referrer"); - //printMsg(lvlTalkative, "cannot access Nix database; continuing anyway"); - //readOnlyMode = true; - int curSchema = getSchema(); if (curSchema > nixSchemaVersion) throw Error(format("current Nix store schema is version %1%, but I only support %2%") -- cgit 1.4.1