wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-05 04:01:47 +02:00
Code Activity

Merge pull request #11618 from NixOS/ignoreException-interrupt

Browse source 
Split ignoreException for destructors vs interrupt-safe
This commit is contained in:
Eelco Dolstra 2024-10-01 17:10:39 +02:00 • committed by GitHub
commit 3e7b42dd89
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 164 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libexpr/eval-cache.cc
View file

@ -101,7 +101,7 @@ struct AttrDb
state->txn->commit();
state->txn.reset();
} catch (...) {
ignoreException();
ignoreExceptionInDestructor();
}
}
@ -112,7 +112,7 @@ struct AttrDb
try {
return fun();
} catch (SQLiteError &) {
ignoreException();
ignoreExceptionExceptInterrupt();
failed = true;
return 0;
}
@ -351,7 +351,7 @@ static std::shared_ptr<AttrDb> makeAttrDb(
try {
return std::make_shared<AttrDb>(cfg, fingerprint, symbols);
} catch (SQLiteError &) {
ignoreException();
ignoreExceptionExceptInterrupt();
return nullptr;
}
}