From de39cd7793a570f19e3dc88310e878be7d1e5d66 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sat, 18 Mar 2023 10:48:25 +0100 Subject: [PATCH] update.cpp: remove pkg management stuff from image update 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. --- src/gui/update.cpp | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/src/gui/update.cpp b/src/gui/update.cpp index 1dff60fda..bda2e4d35 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -48,9 +48,6 @@ #include #include -#if ENABLE_PKG_MANAGEMENT -#include -#endif #include #include #include @@ -468,8 +465,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]); @@ -501,27 +497,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)