From 4b88c2b95d7e21820adad02317aa0cfee98b29c1 Mon Sep 17 00:00:00 2001 From: wyrie <wyrie@ispconfig3> Date: Mon, 18 Oct 2010 06:10:21 -0400 Subject: [PATCH] Server: Gentoo updates --- server/mods-available/monitor_core_module.inc.php | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php index dcdeac7..c687998 100644 --- a/server/mods-available/monitor_core_module.inc.php +++ b/server/mods-available/monitor_core_module.inc.php @@ -921,20 +921,17 @@ * Then test the upgrade. * if there is any output, then there is a needed update */ - $emergeData = shell_exec('emerge -puDNt --color n --nospinner --quiet world'); + $emergeData = shell_exec('glsa-check -t affected'); if ($emergeData == '') { /* There is nothing to update! */ $state = 'ok'; + $data['output'] = 'No unapplied GLSA\'s found on the system.'; } else { /* There is something to update! */ - $state = 'warning'; + $state = 'info'; + $data['output'] = shell_exec('glsa-check -pv --nocolor affected 2>/dev/null'); } - - /* - * Fetch the output - */ - $data['output'] = shell_exec('emerge -pvuDNt --color n --nospinner world'); } else { /* -- Gitblit v1.9.1