nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-26 20:20:58 +01:00
Code Activity

Merged R8632

Browse source
This commit is contained in:
Wouter den Breejen 2007-10-08 10:15:18 +00:00
parent 3800f55b54
commit 8e9c7d9338
6 changed files with 53 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/build.cc
View file

@ -697,8 +697,8 @@ DerivationGoal::~DerivationGoal()
try {
killChild();
deleteTmpDir(false);
} catch (Error & e) {
printMsg(lvlError, format("error (ignored): %1%") % e.msg());
} catch (...) {
ignoreException();
}
}

6
src/libstore/local-store.cc
View file

@ -274,7 +274,11 @@ LocalStore::LocalStore(bool reserveSpace)
LocalStore::~LocalStore()
{
/* If the database isn't open, this is a NOP. */
nixDB.close();
try {
nixDB.close();
} catch (...) {
ignoreException();
}
}

4
src/libstore/remote-store.cc
View file

@ -149,8 +149,8 @@ RemoteStore::~RemoteStore()
fdSocket.close();
if (child != -1)
child.wait(true);
} catch (Error & e) {
printMsg(lvlError, format("error (ignored): %1%") % e.msg());
} catch (...) {
ignoreException();
}
}