s0me1newithhand7s/system-manager
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Better error handling during generate.

Browse source
This commit is contained in:
r-vdp 2023-05-16 11:48:33 +02:00
parent 39995e4102
commit 2901945cfd
No known key found for this signature in database
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/generate.rs
View file

@ -19,7 +19,10 @@ pub fn generate(store_path: &StorePath) -> Result<()> {
let profile_name = Path::new(PROFILE_NAME); let profile_name = Path::new(PROFILE_NAME);
log::info!("Creating new generation from {store_path}"); log::info!("Creating new generation from {store_path}");
install_nix_profile(store_path, profile_dir, profile_name)?; let status = install_nix_profile(store_path, profile_dir, profile_name)?;
if !status.success() {
anyhow::bail!("Error installing the nix profile, see above for details.");
}
log::info!("Registering GC root..."); log::info!("Registering GC root...");
create_gcroot(GCROOT_PATH, &profile_dir.join(profile_name))?; create_gcroot(GCROOT_PATH, &profile_dir.join(profile_name))?;
@ -33,7 +36,10 @@ fn install_nix_profile(
profile_dir: &Path, profile_dir: &Path,
profile_name: &Path, profile_name: &Path,
) -> Result<process::ExitStatus> { ) -> Result<process::ExitStatus> {
DirBuilder::new().recursive(true).create(profile_dir)?; DirBuilder::new()
.recursive(true)
.create(profile_dir)
.context("While creating the profile dir.")?;
let status = process::Command::new("nix-env") let status = process::Command::new("nix-env")
.arg("--profile") .arg("--profile")
.arg(profile_dir.join(profile_name)) .arg(profile_dir.join(profile_name))
@ -41,7 +47,8 @@ fn install_nix_profile(
.arg(&store_path.store_path) .arg(&store_path.store_path)
.stdout(process::Stdio::inherit()) .stdout(process::Stdio::inherit())
.stderr(process::Stdio::inherit()) .stderr(process::Stdio::inherit())
.status()?; .status()
.context("While running nix-env.")?;
Ok(status) Ok(status)
} }