From 588cb0eade0c14acdf4a20dfec5678715cc6542e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 15 Jun 2006 11:56:49 +0000 Subject: * In `nix-env -i|-u|-e', lock the profile to prevent races between concurrent nix-env operations on the same profile. Fixes NIX-7. --- src/libstore/pathlocks.hh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/libstore/pathlocks.hh') diff --git a/src/libstore/pathlocks.hh b/src/libstore/pathlocks.hh index 42ebe58df691..2fd0e0d1ed52 100644 --- a/src/libstore/pathlocks.hh +++ b/src/libstore/pathlocks.hh @@ -18,8 +18,10 @@ private: public: PathLocks(); - PathLocks(const PathSet & paths); - void lockPaths(const PathSet & _paths); + PathLocks(const PathSet & paths, + const string & waitMsg = ""); + void lockPaths(const PathSet & _paths, + const string & waitMsg = ""); ~PathLocks(); void setDeletion(bool deletePaths); }; -- cgit 1.4.1