mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-01 01:41:12 +02:00
opkg_manager: ensure update of package list after menu update
Origin commit data
------------------
Commit: a8ef8dc086
Author: Thilo Graf <dbt@novatux.de>
Date: 2021-05-14 (Fri, 14 May 2021)
This commit is contained in:
@@ -136,8 +136,7 @@ void COPKGManager::init(int wizard_mode)
|
||||
list_upgradeable_done = false;
|
||||
expert_mode = false;
|
||||
local_dir = &g_settings.update_dir_opkg;
|
||||
v_bad_pattern = getBadPackagePatternList();
|
||||
v_good_pattern = getGoodPackagePatternList();
|
||||
initPackagePatternLists();
|
||||
|
||||
silent = false;
|
||||
num_updates = 0;
|
||||
@@ -359,6 +358,14 @@ static const struct button_label COPKGManagerFooterButtonsExpert[COPKGManagerFoo
|
||||
{ NEUTRINO_ICON_BUTTON_BLUE, LOCALE_OPKG_BUTTON_UNINSTALL }
|
||||
};
|
||||
|
||||
void COPKGManager::initPackagePatternLists()
|
||||
{
|
||||
v_bad_pattern.clear();
|
||||
v_bad_pattern = getBadPackagePatternList();
|
||||
v_good_pattern.clear();
|
||||
v_good_pattern = getGoodPackagePatternList();
|
||||
}
|
||||
|
||||
vector<string> COPKGManager::getBadPackagePatternList()
|
||||
{
|
||||
return COPKGManager::getPackagePatternList(OPKG_BAD_LIST);
|
||||
@@ -477,6 +484,7 @@ void COPKGManager::updateMenu()
|
||||
bool upgradesAvailable = false;
|
||||
getPkgData(CMD_LIST_INSTALLED);
|
||||
getPkgData(CMD_LIST_UPGRADEABLE);
|
||||
initPackagePatternLists();
|
||||
for (map<string, struct pkg>::iterator it = pkg_map.begin(); it != pkg_map.end(); ++it) {
|
||||
/* this should no longer trigger at all */
|
||||
if (!isPermittedPackage(it->second.name))
|
||||
|
Reference in New Issue
Block a user