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

* In the garbage collector, if deleting a path fails, try to fix its

Browse source 
ownership, then try again.
This commit is contained in:
Eelco Dolstra 2006-12-07 15:54:52 +00:00
parent a0a43c3206
commit ec23ecc64d
3 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libstore/build.cc
View file

@ -452,12 +452,18 @@ void UserLock::release()
}
static bool amPrivileged()
bool amPrivileged()
{
return geteuid() == 0;
}
bool haveBuildUsers()
{
return querySetting("build-users-group", "") != "";
}
static void killUserWrapped(uid_t uid)
{
if (amPrivileged())
@ -468,7 +474,7 @@ static void killUserWrapped(uid_t uid)
}
static void getOwnership(const Path & path)
void getOwnership(const Path & path)
{
string program = nixLibexecDir + "/nix-setuid-helper";
@ -513,8 +519,7 @@ static void deletePathWrapped(const Path & path)
/* 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 (querySetting("build-users-group", "") != ""
|| !amPrivileged())
if (haveBuildUsers() && !amPrivileged())
getOwnership(path);
deletePath(path);
}
@ -1320,7 +1325,7 @@ void DerivationGoal::startBuilder()
/* If `build-users-group' is not empty, then we have to build as
one of the members of that group. */
if (querySetting("build-users-group", "") != "") {
if (haveBuildUsers()) {
buildUser.acquire();
assert(buildUser.getUID() != 0);
assert(buildUser.getGID() != 0);