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

Fix compilation in FreeBSD and DragonflyBSD (#289)

Browse Source
This commit is contained in:
Roey Darwish Dror
2020-01-06 22:33:32 +02:00
committed by GitHub
parent d18de22b09
commit 3c67e53d88
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/steps/os/dragonfly.rs
View File

@@ -1,8 +1,7 @@
use crate::error::TopgradeError;
use crate::executor::RunType; use crate::executor::RunType;
use crate::terminal::print_separator; use crate::terminal::print_separator;
use crate::utils::require_option; use crate::utils::require_option;
use failure::ResultExt; use anyhow::Result;
use std::path::PathBuf; use std::path::PathBuf;
use std::process::Command; use std::process::Command;
@@ -20,10 +19,8 @@ pub fn audit_packages(sudo: &Option<PathBuf>) -> Result<()> {
println!(); println!();
Command::new(sudo) Command::new(sudo)
.args(&["/usr/local/sbin/pkg", "audit", "-Fr"]) .args(&["/usr/local/sbin/pkg", "audit", "-Fr"])
.spawn() .spawn()?
.context(ErrorKind::ProcessExecution)? .wait()?;
.wait()
.context(ErrorKind::ProcessExecution)?;
} }
Ok(()) Ok(())
} }

9
src/steps/os/freebsd.rs
View File

@@ -1,8 +1,7 @@
use crate::error::TopgradeError;
use crate::executor::RunType; use crate::executor::RunType;
use crate::terminal::print_separator; use crate::terminal::print_separator;
use crate::utils::require_option; use crate::utils::require_option;
use failure::ResultExt; use anyhow::Result;
use std::path::PathBuf; use std::path::PathBuf;
use std::process::Command; use std::process::Command;
@@ -26,10 +25,8 @@ pub fn audit_packages(sudo: &Option<PathBuf>) -> Result<()> {
println!(); println!();
Command::new(sudo) Command::new(sudo)
.args(&["/usr/sbin/pkg", "audit", "-Fr"]) .args(&["/usr/sbin/pkg", "audit", "-Fr"])
.spawn() .spawn()?
.context(ErrorKind::ProcessExecution)? .wait()?;
.wait()
.context(ErrorKind::ProcessExecution)?;
} }
Ok(()) Ok(())
} }