1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 06:01:48 +02:00

Merge branch 'master' into no-manifests

This commit is contained in:
Eelco Dolstra 2012-08-01 18:03:49 -04:00
commit 9c2decaa19
4 changed files with 20 additions and 17 deletions

View file

@ -1,3 +1,5 @@
#include "config.h"
#include "util.hh"
#include "local-store.hh"
#include "immutable.hh"
@ -51,6 +53,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);
@ -65,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;