From 96c95ad8ca4c460394b64a4d0ce7d2f0622125af Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 18 Jun 2015 02:23:08 -0400
Subject: [PATCH] - added anothier lock check for apt - changed language import to use mb_substr
---
interface/web/admin/language_import.php | 2 +-
server/lib/classes/cron.d/100-monitor_system_update.inc.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/interface/web/admin/language_import.php b/interface/web/admin/language_import.php
index 00d105c..be822cf 100644
--- a/interface/web/admin/language_import.php
+++ b/interface/web/admin/language_import.php
@@ -36,7 +36,7 @@
$new_string = '';
for($c = 0; $c < mb_strlen($string); $c++) {
- $char = $string{$c};
+ $char = mb_substr($string, $c, 1);
if($in_string === true && $escaped === false && $char === $quote) {
// this marks a string end (e.g. for concatenation)
diff --git a/server/lib/classes/cron.d/100-monitor_system_update.inc.php b/server/lib/classes/cron.d/100-monitor_system_update.inc.php
index 2eea785..bc4f521 100644
--- a/server/lib/classes/cron.d/100-monitor_system_update.inc.php
+++ b/server/lib/classes/cron.d/100-monitor_system_update.inc.php
@@ -76,13 +76,13 @@
/*
* first update the "apt database"
*/
- shell_exec('apt-get update');
+ shell_exec('while fuser /var/lib/apt/lists/lock >/dev/null 2>&1 ; do sleep 2; done; apt-get update');
/*
* Then test the upgrade.
* if there is any output, then there is a needed update
*/
- $aptData = shell_exec('while fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do sleep 2; done; apt-get -s -qq dist-upgrade');
+ $aptData = shell_exec('while fuser /var/lib/dpkg/lock >/dev/null 2>&1 || fuser /var/lib/apt/lists/lock >/dev/null 2>&1 ; do sleep 2; done; apt-get -s -qq dist-upgrade');
if ($aptData == '') {
/* There is nothing to update! */
$state = 'ok';
--
Gitblit v1.9.1