mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

update.cpp: remove pkg management stuff from image update

Browse Source 
Was broken here, and it's easier for users of package manager to
handle since last changes of package manager, and it's easier to
maintain class CFlashUpdate without impact of package manager.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c29769aac
Author: Thilo Graf <dbt@novatux.de>
Date: 2023-03-19 (Sun, 19 Mar 2023)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2023-03-19 21:49:26 +01:00
committed by vanhofen
parent a4882fe982
commit 93317ec0ad
1 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gui/update.cpp
View File

@@ -48,9 +48,6 @@
#include <gui/color.h>
#include <gui/filebrowser.h>
#if ENABLE_PKG_MANAGEMENT
#include <gui/opkg_manager.h>
#endif
#include <gui/widget/menue_options.h>
#include <gui/widget/msgbox.h>
#include <gui/widget/hintbox.h>
@@ -466,8 +463,7 @@ bool CFlashUpdate::checkVersion4Update()
UpdatesFilter.addFilter("zip");
#endif
}
std::string filters[] = {"bin", "txt", "opk", "ipk"};
std::string filters[] = {"bin", "txt"};
for (size_t i = 0; i < sizeof(filters) / sizeof(filters[0]) ; i++)
UpdatesFilter.addFilter(filters[i]);
@@ -499,27 +495,6 @@ bool CFlashUpdate::checkVersion4Update()
}
hide();
#if ENABLE_PKG_MANAGEMENT
// package install:
if (file_selected->getType() == CFile::FILE_PKG_PACKAGE)
{
COPKGManager opkg;
if (opkg.hasOpkgSupport())
{
int msgres = ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_OPKG_WARNING_3RDPARTY_PACKAGES, CMsgBox::mbrNo, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_UPDATE, 700);
if (msgres == CMsgBox::mbrYes)
{
if (!opkg.installPackage(UpdatesBrowser.getSelectedFile()->Name))
DisplayErrorMessage(g_Locale->getText(LOCALE_OPKG_FAILURE_INSTALL));
}
}
else
DisplayInfoMessage(g_Locale->getText(LOCALE_MESSAGEBOX_FEATURE_NOT_SUPPORTED));
// !always leave here!
return false;
}
#endif
// set internal filetype
char const *ptr = rindex(filename.c_str(), '.');
if (ptr)