diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-08T00·24+0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-08T00·24+0100 |
commit | bdd4646338da296fdf3a8f9dc3cf5aff1dafa163 (patch) | |
tree | 8bda49fe3eaef361a025c0f3b64ea51ea7728cbe /src/libstore/local-store.hh | |
parent | e73d9e948887621906363a35c980538294898a02 (diff) |
Revert "Prevent config.h from being clobbered"
This reverts commit 28bba8c44f484eae38e8a15dcec73cfa999156f6.
Diffstat (limited to 'src/libstore/local-store.hh')
-rw-r--r-- | src/libstore/local-store.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh index 2b0d71380915..14a826b3a58d 100644 --- a/src/libstore/local-store.hh +++ b/src/libstore/local-store.hh @@ -307,9 +307,9 @@ private: without execute permission; setuid bits etc. are cleared) - the owner and group are set to the Nix user and group, if we're in a setuid Nix installation. */ -void canonicalisePathMetaData(const Path & path); +void canonicalisePathMetaData(const Path & path, uid_t fromUid); -void canonicalisePathMetaData(const Path & path, bool recurse); +void canonicaliseTimestampAndPermissions(const Path & path); MakeError(PathInUse, Error); |