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

Fix a scenario where fwupdmgr has nothing to update (fix #246)

Browse Source
This commit is contained in:
Roey Darwish Dror
2019-11-04 22:49:22 +02:00
parent 95b547d739
commit 4e1e0788f8
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
use crate::config::Config; use crate::config::Config;
use crate::error::{Error, ErrorKind}; use crate::error::{Error, ErrorKind};
use crate::executor::RunType; use crate::executor::{ExecutorExitStatus, RunType};
use crate::terminal::{print_separator, print_warning}; use crate::terminal::{print_separator, print_warning};
use crate::utils::{require, require_option, which, PathExt}; use crate::utils::{require, require_option, which, PathExt};
use failure::ResultExt; use failure::ResultExt;
@@ -349,7 +349,15 @@ pub fn run_fwupdmgr(run_type: RunType) -> Result<(), Error> {
print_separator("Firmware upgrades"); print_separator("Firmware upgrades");
run_type.execute(&fwupdmgr).arg("refresh").check_run()?; run_type.execute(&fwupdmgr).arg("refresh").check_run()?;
run_type.execute(&fwupdmgr).arg("get-updates").check_run() let exit_status = run_type.execute(&fwupdmgr).arg("get-updates").spawn()?.wait()?;
if let ExecutorExitStatus::Wet(e) = exit_status {
if !(e.success() || e.code().map(|c| c == 2).unwrap_or(false)) {
return Err(ErrorKind::ProcessFailed(e).into());
}
}
Ok(())
} }
#[must_use] #[must_use]