diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-12-02 14:34:14 +0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-12-02 14:34:14 +0000 |
commit | 9c9cdb06d095ea91e10be8dae3a85f06a99c51bf (patch) | |
tree | 0fc5fdc4fdc0d1493dca1681147bab6a8f5e3f86 /src/libstore/store-api.cc | |
parent | 626f8ee42f0b984ebc1cbf0b39938bcb3edf3bd7 (diff) |
* Remove SwitchToOriginalUser, we're not going to need it anymore.
Diffstat (limited to 'src/libstore/store-api.cc')
-rw-r--r-- | src/libstore/store-api.cc | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc index a560b3f55..fb86fc6ab 100644 --- a/src/libstore/store-api.cc +++ b/src/libstore/store-api.cc @@ -96,25 +96,15 @@ Path makeFixedOutputPath(bool recursive, std::pair<Path, Hash> computeStorePathForPath(const Path & srcPath, bool fixed, bool recursive, string hashAlgo) { - Hash h(htSHA256); - { - SwitchToOriginalUser sw; - h = hashPath(htSHA256, srcPath); - } + Hash h = hashPath(htSHA256, srcPath); string baseName = baseNameOf(srcPath); Path dstPath; if (fixed) { - HashType ht(parseHashType(hashAlgo)); - Hash h2(ht); - { - SwitchToOriginalUser sw; - h2 = recursive ? hashPath(ht, srcPath) : hashFile(ht, srcPath); - } - + Hash h2 = recursive ? hashPath(ht, srcPath) : hashFile(ht, srcPath); dstPath = makeFixedOutputPath(recursive, hashAlgo, h2, baseName); } |