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

Fix FreeBSD

Browse Source
This commit is contained in:
Roey Darwish Dror
2019-03-13 11:46:32 +02:00
parent 41ef443e9d
commit 348d115ba7
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.rs
View File

@@ -158,7 +158,7 @@ fn run() -> Result<(), Error> {
execute( execute(
&mut report, &mut report,
"FreeBSD Packages", "FreeBSD Packages",
|| freebsd::upgrade_packages(&sudo, run_type), || freebsd::upgrade_packages(sudo.as_ref(), run_type),
config.no_retry(), config.no_retry(),
)?; )?;
#[cfg(unix)] #[cfg(unix)]
@@ -410,7 +410,7 @@ fn run() -> Result<(), Error> {
execute( execute(
&mut report, &mut report,
"FreeBSD Upgrade", "FreeBSD Upgrade",
|| freebsd::upgrade_freebsd(&sudo, run_type), || freebsd::upgrade_freebsd(sudo.as_ref(), run_type),
config.no_retry(), config.no_retry(),
)?; )?;
} }

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

@@ -1,11 +1,12 @@
use crate::error::{Error, ErrorKind}; use crate::error::{Error, ErrorKind};
use crate::executor::RunType; use crate::executor::RunType;
use crate::terminal::{print_separator, print_warning}; use crate::terminal::print_separator;
use crate::utils::require_option;
use failure::ResultExt; use failure::ResultExt;
use std::path::PathBuf; use std::path::PathBuf;
use std::process::Command; use std::process::Command;
pub fn upgrade_freebsd(sudo: &Option<PathBuf>, run_type: RunType) -> Result<(), Error> { pub fn upgrade_freebsd(sudo: Option<&PathBuf>, run_type: RunType) -> Result<(), Error> {
let sudo = require_option(sudo)?; let sudo = require_option(sudo)?;
print_separator("FreeBSD Update"); print_separator("FreeBSD Update");
run_type run_type
@@ -14,7 +15,7 @@ pub fn upgrade_freebsd(sudo: &Option<PathBuf>, run_type: RunType) -> Result<(),
.check_run() .check_run()
} }
pub fn upgrade_packages(sudo: &Option<PathBuf>, run_type: RunType) -> Result<(), Error> { pub fn upgrade_packages(sudo: Option<&PathBuf>, run_type: RunType) -> Result<(), Error> {
let sudo = require_option(sudo)?; let sudo = require_option(sudo)?;
print_separator("FreeBSD Packages"); print_separator("FreeBSD Packages");
run_type.execute(sudo).args(&["/usr/sbin/pkg", "upgrade"]).check_run() run_type.execute(sudo).args(&["/usr/sbin/pkg", "upgrade"]).check_run()