From 13b41c948607a0e97a49b637c2de46263d9ec94c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 13 Apr 2011 04:29:45 -0400
Subject: [PATCH] Merged revisions 2301-2305 from stable branch.
---
server/mods-available/remoteaction_core_module.inc.php | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php
index f24fadd..ebdd404 100644
--- a/server/mods-available/remoteaction_core_module.inc.php
+++ b/server/mods-available/remoteaction_core_module.inc.php
@@ -134,16 +134,19 @@
/*
* Do the update
*/
- //TODO : change this when distribution information has been integrated into server record
- if(file_exists('/etc/gentoo-release')) {
- exec("glsa-check -f --nocolor affected");
- }
- else {
- exec("aptitude update");
- exec("aptitude upgrade -y");
- }
-
- /*
+ exec("aptitude update");
+ exec("aptitude upgrade -y");
+
+ //TODO : change this when distribution information has been integrated into server record
+ if(file_exists('/etc/gentoo-release')) {
+ exec("glsa-check -f --nocolor affected");
+ }
+ else {
+ exec("aptitude update");
+ exec("aptitude safe-upgrade -y");
+ }
+
+ /*
* All well done!
*/
$this->_actionDone($action['action_id'], 'ok');
--
Gitblit v1.9.1