mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-26 15:56:18 +02:00
nix-collect-garbage: Don't barf on unreadable directories
And don't try to delete generations from unwritable directories.
This commit is contained in:
parent
8d813fe3e0
commit
4441e4cc13
1 changed files with 7 additions and 5 deletions
|
@ -34,21 +34,23 @@ void runProgramSimple(Path program, const Strings & args)
|
|||
|
||||
void removeOldGenerations(std::string dir)
|
||||
{
|
||||
if (access(dir.c_str(), R_OK) != 0) return;
|
||||
|
||||
bool canWrite = access(dir.c_str(), W_OK) == 0;
|
||||
|
||||
for (auto & i : readDirectory(dir)) {
|
||||
checkInterrupt();
|
||||
|
||||
auto path = dir + "/" + i.name;
|
||||
auto type = i.type == DT_UNKNOWN ? getFileType(path) : i.type;
|
||||
|
||||
if (type == DT_LNK) {
|
||||
if (type == DT_LNK && canWrite) {
|
||||
auto link = readLink(path);
|
||||
if (link.find("link") != string::npos) {
|
||||
printMsg(lvlInfo, format("removing old generations of profile %1%") % path);
|
||||
|
||||
auto args = Strings{"-p", path, "--delete-generations", gen};
|
||||
if (dryRun) {
|
||||
args.push_back("--dry-run");
|
||||
}
|
||||
if (dryRun) args.push_back("--dry-run");
|
||||
runProgramSimple(settings.nixBinDir + "/nix-env", args);
|
||||
}
|
||||
} else if (type == DT_DIR) {
|
||||
|
|
Loading…
Reference in a new issue