From fa39665bd3c4cdd616b272bf327d0d041b911a92 Mon Sep 17 00:00:00 2001 From: Roey Darwish Dror Date: Thu, 15 Nov 2018 11:37:08 +0200 Subject: [PATCH] Audit FreeBSD packages at summary --- src/freebsd.rs | 12 +++++++----- src/main.rs | 3 +++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/freebsd.rs b/src/freebsd.rs index 68cc24ca..5e522ef8 100644 --- a/src/freebsd.rs +++ b/src/freebsd.rs @@ -3,6 +3,7 @@ use super::terminal::Terminal; use super::utils::Check; use failure; use std::path::PathBuf; +use std::process::Command; #[must_use] pub fn upgrade_freebsd(sudo: &Option, terminal: &mut Terminal, dry_run: bool) -> Option<(&'static str, bool)> { @@ -40,11 +41,6 @@ pub fn upgrade_packages( .spawn()? .wait()? .check()?; - Executor::new("/usr/sbin/pkg", dry_run) - .arg("audit") - .spawn()? - .wait()? - .check()?; Ok(()) }().is_ok(); @@ -54,3 +50,9 @@ pub fn upgrade_packages( None } } + +pub fn audit_packages() -> Result<(), failure::Error> { + println!(); + Command::new("/usr/sbin/pkg").args(&["audit", "-Fr"]).spawn()?.wait()?; + Ok(()) +} diff --git a/src/main.rs b/src/main.rs index 0f09fca1..ccbf69e7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -456,6 +456,9 @@ fn run() -> Result<(), Error> { distribution.show_summary(); } } + + #[cfg(target_os = "freebsd")] + freebsd::audit_packages().ok(); } if report.data().iter().all(|(_, succeeded)| *succeeded) {