about summary refs log tree commit diff
path: root/src/libstore/pathlocks.hh
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2006-06-15T11·56+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2006-06-15T11·56+0000
commit588cb0eade0c14acdf4a20dfec5678715cc6542e (patch)
treef37d7546d85b9c262c2905aea42399c145a72943 /src/libstore/pathlocks.hh
parent49de87132f3f1685fcdd4157f89ca817647028b0 (diff)
* In `nix-env -i|-u|-e', lock the profile to prevent races between
  concurrent nix-env operations on the same profile.  Fixes NIX-7.

Diffstat (limited to 'src/libstore/pathlocks.hh')
-rw-r--r--src/libstore/pathlocks.hh6
1 files changed, 4 insertions, 2 deletions
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);
 };