mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-01 09:51:13 +02:00
opkg_manager: don't set error flag for shellwindow
The shellwindow exits if the "ok" flag is set to false, aborting further
execution of more commands. This hurts with system-update script.
Origin commit data
------------------
Branch: ni/coolstream
Commit: bbd7667ee9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
------------------
This commit was generated by Migit
This commit is contained in:
committed by
vanhofen
parent
10bd8e6785
commit
c2d852f747
@@ -915,13 +915,13 @@ void COPKGManager::handleShellOutput(string* cur_line, int* res, bool* ok)
|
||||
//download error:
|
||||
if (line.find("opkg_download:") != string::npos){
|
||||
*res = OM_DOWNLOAD_ERR;
|
||||
*ok = false;
|
||||
//*ok = false;
|
||||
return;
|
||||
}
|
||||
//not enough space
|
||||
if (line.find("No space left on device") != string::npos){
|
||||
*res = OM_OUT_OF_SPACE_ERR;
|
||||
*ok = false;
|
||||
//*ok = false;
|
||||
return;
|
||||
}
|
||||
//deps
|
||||
@@ -934,7 +934,7 @@ void COPKGManager::handleShellOutput(string* cur_line, int* res, bool* ok)
|
||||
if (*ok){
|
||||
dprintf(DEBUG_NORMAL, "[COPKGManager] [%s - %d] ERROR: unhandled error %s\n", __func__, __LINE__, line.c_str());
|
||||
*res = OM_UNKNOWN_ERR;
|
||||
*ok = false;
|
||||
//*ok = false;
|
||||
return;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user