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

ref: comment run_config_update (#1448)

Browse Source 
Co-authored-by: Milo <milo@example.com>
Co-authored-by: Gideon <87426140+GideonBear@users.noreply.github.com>
This commit is contained in:
PandaMimo
2025-11-10 13:44:17 +01:00
committed by GitHub
parent 222d800a32
commit 80c4bd5065
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/steps/os/linux.rs
View File

@@ -1030,6 +1030,7 @@ pub fn run_dkp_pacman_update(ctx: &ExecutionContext) -> Result<()> {
} }
pub fn run_config_update(ctx: &ExecutionContext) -> Result<()> { pub fn run_config_update(ctx: &ExecutionContext) -> Result<()> {
// The `config_update` step always requests user input, so when running with `--yes` we need to skip the step entirely
if ctx.config().yes(Step::ConfigUpdate) { if ctx.config().yes(Step::ConfigUpdate) {
return Err(SkipStep(t!("Skipped in --yes").to_string()).into()); return Err(SkipStep(t!("Skipped in --yes").to_string()).into());
} }
@@ -1039,6 +1040,7 @@ pub fn run_config_update(ctx: &ExecutionContext) -> Result<()> {
let sudo = ctx.require_sudo()?; let sudo = ctx.require_sudo()?;
sudo.execute(ctx, etc_update)?.status_checked()?; sudo.execute(ctx, etc_update)?.status_checked()?;
} else if let Ok(pacdiff) = require("pacdiff") { } else if let Ok(pacdiff) = require("pacdiff") {
// When `DIFFPROG` is unset, `pacdiff` uses `vim` by default
if std::env::var("DIFFPROG").is_err() { if std::env::var("DIFFPROG").is_err() {
require("vim")?; require("vim")?;
} }