admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't try to upgrade nix if it's not a part of a profile (#924)

Browse Source
This commit is contained in:
Roey Darwish Dror
2022-05-07 02:24:54 +03:00
committed by GitHub
parent 08e8b56b75
commit 84c3a0f4d1
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/steps/os/unix.rs
View File

@@ -234,6 +234,11 @@ pub fn run_nix(ctx: &ExecutionContext) -> Result<()> {
let nix = require("nix")?; let nix = require("nix")?;
let nix_channel = require("nix-channel")?; let nix_channel = require("nix-channel")?;
let nix_env = require("nix-env")?; let nix_env = require("nix-env")?;
let output = Command::new(&nix_env).args(&["--query", "nix"]).check_output();
debug!("nix-env output: {:?}", output);
let should_self_upgrade = output.is_ok();
print_separator("Nix"); print_separator("Nix");
let multi_user = fs::metadata(&nix)?.uid() == 0; let multi_user = fs::metadata(&nix)?.uid() == 0;
@@ -250,11 +255,14 @@ pub fn run_nix(ctx: &ExecutionContext) -> Result<()> {
let run_type = ctx.run_type(); let run_type = ctx.run_type();
if multi_user { if should_self_upgrade {
ctx.execute_elevated(&nix, true)?.arg("upgrade-nix").check_run()?; if multi_user {
} else { ctx.execute_elevated(&nix, true)?.arg("upgrade-nix").check_run()?;
run_type.execute(&nix).arg("upgrade-nix").check_run()?; } else {
run_type.execute(&nix).arg("upgrade-nix").check_run()?;
}
} }
run_type.execute(&nix_channel).arg("--update").check_run()?; run_type.execute(&nix_channel).arg("--update").check_run()?;
run_type.execute(&nix_env).arg("--upgrade").check_run() run_type.execute(&nix_env).arg("--upgrade").check_run()
} }