From 7b10562370919947c9df748a165587ec5fc6c2ea Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 Aug 2012 16:06:49 -0400 Subject: Make ‘nix-store --optimise’ interruptible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libstore/optimise-store.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/libstore') diff --git a/src/libstore/optimise-store.cc b/src/libstore/optimise-store.cc index 486538bd29f6..2c3f59a72428 100644 --- a/src/libstore/optimise-store.cc +++ b/src/libstore/optimise-store.cc @@ -51,6 +51,8 @@ struct MakeImmutable void LocalStore::optimisePath_(OptimiseStats & stats, const Path & path) { + checkInterrupt(); + struct stat st; if (lstat(path.c_str(), &st)) throw SysError(format("getting attributes of path `%1%'") % path); -- cgit 1.4.1 From 234ce610e0671410cb8a9ce4d8725e55472e8d47 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 Aug 2012 16:09:47 -0400 Subject: Doh --- src/libstore/optimise-store.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/libstore') diff --git a/src/libstore/optimise-store.cc b/src/libstore/optimise-store.cc index 2c3f59a72428..c05447f4a27f 100644 --- a/src/libstore/optimise-store.cc +++ b/src/libstore/optimise-store.cc @@ -1,3 +1,5 @@ +#include "config.h" + #include "util.hh" #include "local-store.hh" #include "immutable.hh" @@ -67,7 +69,6 @@ void LocalStore::optimisePath_(OptimiseStats & stats, const Path & path) /* We can hard link regular files and maybe symlinks. */ if (!S_ISREG(st.st_mode) #if CAN_LINK_SYMLINK - x && !S_ISLNK(st.st_mode) #endif ) return; -- cgit 1.4.1