mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

COPKGManager: show message on space error

Browse Source
This commit is contained in:
Thilo Graf
2014-12-30 21:18:44 +01:00
parent 362018ed76
commit 28d17802d4
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/opkg_manager.cpp
View File

@@ -368,7 +368,8 @@ int COPKGManager::doUpdate()
{ {
int r = execCmd(pkg_types[OM_UPDATE]); int r = execCmd(pkg_types[OM_UPDATE]);
if (r == -1) { if (r == -1) {
DisplayErrorMessage(g_Locale->getText(LOCALE_OPKG_FAILURE_UPDATE)); string msg = string(g_Locale->getText(LOCALE_OPKG_FAILURE_UPDATE)) + "\n" + err_msg;
DisplayErrorMessage(msg.c_str());
return r; return r;
} }
return 0; return 0;
@@ -669,6 +670,10 @@ void COPKGManager::handleShellOutput(string& cur_line)
err_msg += "Cannot install package!\n"; err_msg += "Cannot install package!\n";
has_err = true; has_err = true;
} }
if (cur_line.find("No space left on device") != string::npos){
err_msg += "Not enough space available!\n";
has_err = true;
}
if (has_err) if (has_err)
return; return;
@@ -677,9 +682,10 @@ void COPKGManager::handleShellOutput(string& cur_line)
if (pos1 != string::npos){ if (pos1 != string::npos){
string str = cur_line.substr(pos1, cur_line.length()-pos1); string str = cur_line.substr(pos1, cur_line.length()-pos1);
err_msg += str.replace(pos1, 3,"") + "\n"; err_msg += str.replace(pos1, 3,"") + "\n";
return; has_err = true;
} }
if (has_err)
return;
} }
if (!has_err) if (!has_err)
tmp_str += cur_line + "\n"; tmp_str += cur_line + "\n";