wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

* Use deletePathWrapped() in more places.

Browse source
This commit is contained in:
Eelco Dolstra 2006-12-09 00:26:24 +00:00
parent fa33303146
commit 5f681988f2
3 changed files with 30 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/libstore/build.cc
View file

@ -531,14 +531,28 @@ void getOwnership(const Path & path)
}
static void deletePathWrapped(const Path & path)
void deletePathWrapped(const Path & path,
unsigned long long & bytesFreed)
{
/* When using build users and we're not root, we may not have
sufficient permission to delete the path. So use the setuid
helper to change ownership to us. */
if (haveBuildUsers() && !amPrivileged())
getOwnership(path);
deletePath(path);
try {
/* First try to delete it ourselves. */
deletePath(path, bytesFreed);
} catch (SysError & e) {
/* If this failed due to a permission error, then try it with
the setuid helper. */
if (haveBuildUsers() && !amPrivileged()) {
getOwnership(path);
deletePath(path, bytesFreed);
} else
throw;
}
}
void deletePathWrapped(const Path & path)
{
unsigned long long dummy;
deletePathWrapped(path, dummy);
}