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

Don't run pacdiff when --yes is specified (fix #846)

Browse Source
This commit is contained in:
Roey Darwish Dror
2022-01-26 22:50:52 +02:00
parent 6b09212814
commit 5f4dd33f1f
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.rs
View File

@@ -135,9 +135,7 @@ fn run() -> Result<()> {
println!("Error detecting current distribution: {}", e); println!("Error detecting current distribution: {}", e);
} }
} }
runner.execute(Step::System, "config-update", || { runner.execute(Step::System, "config-update", || linux::run_config_update(&ctx))?;
linux::run_config_update(sudo.as_ref(), run_type)
})?;
runner.execute(Step::BrewFormula, "Brew", || { runner.execute(Step::BrewFormula, "Brew", || {
unix::run_brew_formula(&ctx, unix::BrewVariant::Linux) unix::run_brew_formula(&ctx, unix::BrewVariant::Linux)

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

@@ -4,6 +4,7 @@ use std::process::Command;
use anyhow::Result; use anyhow::Result;
use ini::Ini; use ini::Ini;
use log::{debug, warn}; use log::{debug, warn};
use regex::internal::Exec;
use crate::error::{SkipStep, TopgradeError}; use crate::error::{SkipStep, TopgradeError};
use crate::execution_context::ExecutionContext; use crate::execution_context::ExecutionContext;
@@ -532,19 +533,22 @@ pub fn run_pihole_update(sudo: Option<&PathBuf>, run_type: RunType) -> Result<()
run_type.execute(sudo).arg(pihole).arg("-up").check_run() run_type.execute(sudo).arg(pihole).arg("-up").check_run()
} }
pub fn run_config_update(sudo: Option<&PathBuf>, run_type: RunType) -> Result<()> { pub fn run_config_update(ctx: &ExecutionContext) -> Result<()> {
let sudo = require_option(sudo, String::from("sudo is not installed"))?; let sudo = require_option(ctx.sudo().as_ref(), String::from("sudo is not installed"))?;
if ctx.config().yes(Step::System) {
return Err(SkipStep("Skipped in --yes".to_string()).into());
}
if let Ok(etc_update) = require("etc-update") { if let Ok(etc_update) = require("etc-update") {
print_separator("Configuration update"); print_separator("Configuration update");
run_type.execute(sudo).arg(etc_update).check_run()?; ctx.run_type().execute(sudo).arg(etc_update).check_run()?;
} else if let Ok(pacdiff) = require("pacdiff") { } else if let Ok(pacdiff) = require("pacdiff") {
if std::env::var("DIFFPROG").is_err() { if std::env::var("DIFFPROG").is_err() {
require("vim")?; require("vim")?;
} }
print_separator("Configuration update"); print_separator("Configuration update");
run_type ctx.run_type()
.execute(sudo) .execute(sudo)
.arg("--preserve-env=DIFFPROG") .arg("--preserve-env=DIFFPROG")
.arg(pacdiff) .arg(pacdiff)