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

update: fix detection of image type

Browse Source 
Origin commit data
------------------
Commit: 2b36576084
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-11-30 (Fri, 30 Nov 2018)

Origin message was:
------------------
- update: fix detection of image type
This commit is contained in:
vanhofen
2018-11-30 00:08:42 +01:00
parent e76341220f
commit 19108de408
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/update.cpp
View File

@@ -123,6 +123,7 @@ CFlashUpdate::CFlashUpdate()
sysfs = MTD_DEVICE_OF_UPDATE_PART; sysfs = MTD_DEVICE_OF_UPDATE_PART;
dprintf(DEBUG_NORMAL, "[update] mtd partition to update: %s\n", sysfs.c_str()); dprintf(DEBUG_NORMAL, "[update] mtd partition to update: %s\n", sysfs.c_str());
notify = true; notify = true;
gotImage = false;
} }
@@ -349,9 +350,11 @@ bool CFlashUpdate::selectHttpImage(void)
newVersion = versions[selected]; newVersion = versions[selected];
file_md5 = md5s[selected]; file_md5 = md5s[selected];
fileType = fileTypes[selected]; fileType = fileTypes[selected];
gotImage = (fileType <= '9');
//NI #ifdef BOXMODEL_CS_HD2 //NI #ifdef BOXMODEL_CS_HD2
#if 0 #if 0
if(fileType <= '2') { if (gotImage)
{
int esize = CMTDInfo::getInstance()->getMTDEraseSize(sysfs); int esize = CMTDInfo::getInstance()->getMTDEraseSize(sysfs);
dprintf(DEBUG_NORMAL, "[update] erase size is %x\n", esize); dprintf(DEBUG_NORMAL, "[update] erase size is %x\n", esize);
if (esize == 0x40000) { if (esize == 0x40000) {
@@ -360,7 +363,7 @@ bool CFlashUpdate::selectHttpImage(void)
} }
#endif #endif
#if HAVE_ARM_HARDWARE #if HAVE_ARM_HARDWARE
if ((fileType <= '2') && (filename.substr(filename.find_last_of(".") + 1) == "tgz")) if (gotImage && (filename.substr(filename.find_last_of(".") + 1) == "tgz"))
{ {
// manipulate fileType for tgz-packages // manipulate fileType for tgz-packages
fileType = 'Z'; fileType = 'Z';
@@ -413,7 +416,7 @@ bool CFlashUpdate::checkVersion4Update()
versionInfo = new CFlashVersionInfo(newVersion);//Memory leak: versionInfo versionInfo = new CFlashVersionInfo(newVersion);//Memory leak: versionInfo
sprintf(msg, g_Locale->getText(msg_body), versionInfo->getType(true), versionInfo->getVersionString(), versionInfo->getDate(), versionInfo->getTime()); sprintf(msg, g_Locale->getText(msg_body), versionInfo->getType(true), versionInfo->getVersionString(), versionInfo->getDate(), versionInfo->getTime());
if (fileType <= '2') if (gotImage)
{ {
if ((strncmp(RELEASE_CYCLE, versionInfo->getReleaseCycle(), 2) != 0) && if ((strncmp(RELEASE_CYCLE, versionInfo->getReleaseCycle(), 2) != 0) &&
(ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_FLASHUPDATE_WRONGBASE, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_UPDATE) != CMsgBox::mbrYes)) (ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_FLASHUPDATE_WRONGBASE, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_UPDATE) != CMsgBox::mbrYes))
@@ -569,7 +572,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey)
return menu_return::RETURN_REPAINT; return menu_return::RETURN_REPAINT;
} }
if(softupdate_mode==1) { //internet-update if(softupdate_mode==1) { //internet-update
if ( ShowMsg(LOCALE_MESSAGEBOX_INFO, ((fileType <= '2') || (fileType == 'Z')) ? LOCALE_FLASHUPDATE_INSTALL_IMAGE : LOCALE_FLASHUPDATE_INSTALL_PACKAGE, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_UPDATE) != CMsgBox::mbrYes) if ( ShowMsg(LOCALE_MESSAGEBOX_INFO, gotImage ? LOCALE_FLASHUPDATE_INSTALL_IMAGE : LOCALE_FLASHUPDATE_INSTALL_PACKAGE, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_UPDATE) != CMsgBox::mbrYes)
{ {
hide(); hide();
return menu_return::RETURN_REPAINT; return menu_return::RETURN_REPAINT;
@@ -579,7 +582,8 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey)
showGlobalStatus(60); showGlobalStatus(60);
dprintf(DEBUG_NORMAL, "[update] flash/install filename %s type %c\n", filename.c_str(), fileType); dprintf(DEBUG_NORMAL, "[update] flash/install filename %s type %c\n", filename.c_str(), fileType);
if(fileType <= '2') { if (gotImage)
{
//flash it... //flash it...
#if ENABLE_EXTUPDATE #if ENABLE_EXTUPDATE
#ifndef BOXMODEL_CS_HD2 #ifndef BOXMODEL_CS_HD2

1
src/gui/update.h
View File

@@ -52,6 +52,7 @@ class CFlashUpdate : public CProgressWindow
std::string file_md5; std::string file_md5;
std::string sysfs; std::string sysfs;
char fileType; char fileType;
bool gotImage;
int width; int width;
bool notify; bool notify;