Commit ca09d5a0 authored by Franco Fichtner's avatar Franco Fichtner

Revert "firmware: pkg can also change options, make sure this is caught"

This reverts commit cd379a8f.

Looks like this isn't entirely correct: as long as the packages is
not upgraded we can see normal package upgrades alongside pkg reinstall.
Maybe this is new since 1.10?  In any case, yay for less code.
parent 5e53c764
......@@ -59,10 +59,8 @@ class FirmwareController extends ApiControllerBase
} elseif (array_key_exists('updates', $response) && $response['updates'] == 0) {
$response['status_msg'] = gettext('There are no updates available on the selected mirror.');
$response['status'] = 'none';
} elseif ((array_key_exists(0, $response['upgrade_packages']) &&
$response['upgrade_packages'][0]['name'] == 'pkg') ||
(array_key_exists(0, $response['reinstall_packages']) &&
$response['reinstall_packages'][0]['name'] == 'pkg')) {
} elseif (array_key_exists(0, $response['upgrade_packages']) &&
$response['upgrade_packages'][0]['name'] == 'pkg') {
$response['status_upgrade_action'] = 'pkg';
$response['status'] = 'ok';
$response['status_msg'] = gettext('There is a mandatory update for the package manager available.');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment