firmware: "The package manager is not responding."

This commit is contained in:
Franco Fichtner 2018-06-27 16:08:50 +00:00
parent 738bd2acc3
commit f74c1f583d
2 changed files with 9 additions and 5 deletions

View File

@ -182,6 +182,9 @@ class FirmwareController extends ApiControllerBase
$response['status_msg'] = gettext('The release type requires an update.');
$response['status_upgrade_action'] = 'rel';
$response['status'] = 'ok';
} elseif (array_key_exists('connection', $response) && $response['connection'] == 'busy') {
$response['status_msg'] = gettext('The package manager is not responding.');
$response['status'] = 'error';
} elseif (array_key_exists('connection', $response) && $response['connection'] == 'unresolved') {
$response['status_msg'] = gettext('No address record found for the selected mirror.');
$response['status'] = 'error';

View File

@ -26,7 +26,7 @@
# POSSIBILITY OF SUCH DAMAGE.
# This script generates a json structured file with the following content:
# connection: error|timeout|unauthenticated|misconfigured|unresolved|ok
# connection: error|timeout|unauthenticated|misconfigured|unresolved|busy|ok
# repository: error|ok
# last_ckeck: <date_time_stamp>
# updates: <num_of_updates>
@ -338,9 +338,12 @@ if [ "$pkg_running" == "" ]; then
product_name=$(cat /usr/local/opnsense/version/opnsense.name)
os_version=$(uname -sr)
last_check=$(date)
else
connection=busy
fi
# write our json structure
cat << EOF
# write our json structure
cat << EOF
{
"connection":"$connection",
"downgrade_packages":[$packages_downgraded],
@ -360,5 +363,3 @@ if [ "$pkg_running" == "" ]; then
"upgrade_packages":[$packages_upgraded]
}
EOF
fi