the-distro/ofborg
2
0
Fork 1
Code Issues 6 Pull requests 1 Packages Projects Releases Wiki Activity

Merge pull request #449 from cole-h/ignore-remove-file

Browse source 
nixenv: warn when removing the stats file fails
This commit is contained in:
Graham Christensen 2020-04-03 20:45:55 -04:00 committed by GitHub
parent 0db6f70714 9736cf08fe
commit 91f6aee4d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ofborg/src/nixenv.rs
View file

@ -72,7 +72,13 @@ impl HydraNixEnv {
let outpath_stats = self.outpath_stats_path();
fs::remove_file(&outpath_nix).map_err(|e| Error::RemoveFile(outpath_nix, e))?;
fs::remove_file(&outpath_stats).map_err(|e| Error::RemoveFile(outpath_stats, e))?;
// Removing the stats file can fail if `nix` itself errored, for example
// when it fails to evaluate something. In this case, we can ignore (but
// warn about) the error.
if let Err(e) = fs::remove_file(&outpath_stats) {
warn!("Failed to remove file {:?}: {:?}", outpath_stats, e)
}
Ok(())
}
@ -130,12 +136,8 @@ impl Error {
pub fn display(self) -> String {
match self {
Error::Io(e) => format!("Failed during the setup of executing nix-env: {:?}", e),
Error::CreateFile(path, err) => {
format!("Failed to create file '{:?}': {:?}", path, err)
}
Error::RemoveFile(path, err) => {
format!("Failed to remove file '{:?}': {:?}", path, err)
}
Error::CreateFile(path, err) => format!("Failed to create file {:?}: {:?}", path, err),
Error::RemoveFile(path, err) => format!("Failed to remove file {:?}: {:?}", path, err),
Error::WriteFile(file, err) => {
format!("Failed to write to file '{:?}': {:?}", file, err)
}