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

opkg_manager: make error messages less cryptic

Browse Source 
the errno has nothing to do with the error that happened, so do not use
it for the error message
This commit is contained in:
Stefan Seyfried
2017-01-29 21:27:45 +01:00
committed by svenhoefer
parent 8a6194a047
commit 3fb3f39be7
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/opkg_manager.cpp
View File

@@ -213,7 +213,10 @@ int COPKGManager::exec(CMenuTarget* parent, const string &actionKey)
{ {
string pkg_name = fileBrowser.getSelectedFile()->Name; string pkg_name = fileBrowser.getSelectedFile()->Name;
if (!installPackage(pkg_name)) if (!installPackage(pkg_name))
showError(g_Locale->getText(LOCALE_OPKG_FAILURE_INSTALL), "", pkg_name);
/* errno is never set properly, the string is totally useless.
showError(g_Locale->getText(LOCALE_OPKG_FAILURE_INSTALL), strerror(errno), pkg_name); showError(g_Locale->getText(LOCALE_OPKG_FAILURE_INSTALL), strerror(errno), pkg_name);
*/
*local_dir = fileBrowser.getCurrentDir(); *local_dir = fileBrowser.getCurrentDir();
refreshMenu(); refreshMenu();
@@ -225,7 +228,10 @@ int COPKGManager::exec(CMenuTarget* parent, const string &actionKey)
parent->hide(); parent->hide();
int r = execCmd(actionKey, CShellWindow::VERBOSE | CShellWindow::ACKNOWLEDGE_EVENT); int r = execCmd(actionKey, CShellWindow::VERBOSE | CShellWindow::ACKNOWLEDGE_EVENT);
if (r) { if (r) {
/* errno is never set properly, the string is totally useless.
showError(g_Locale->getText(LOCALE_OPKG_FAILURE_UPGRADE), strerror(errno), actionKey); showError(g_Locale->getText(LOCALE_OPKG_FAILURE_UPGRADE), strerror(errno), actionKey);
*/
showError(g_Locale->getText(LOCALE_OPKG_FAILURE_UPGRADE), "", actionKey);
} else } else
installed = true; installed = true;
refreshMenu(); refreshMenu();
@@ -999,7 +1005,10 @@ bool COPKGManager::installPackage(const string& pkg_name, string options, bool f
break; break;
} }
default: default:
showError(g_Locale->getText(LOCALE_OPKG_FAILURE_INSTALL), "", pkg_types[OM_INSTALL] + opts + pkg_name);
/* errno / strerror considered useless here
showError(g_Locale->getText(LOCALE_OPKG_FAILURE_INSTALL), strerror(errno), pkg_types[OM_INSTALL] + opts + pkg_name); showError(g_Locale->getText(LOCALE_OPKG_FAILURE_INSTALL), strerror(errno), pkg_types[OM_INSTALL] + opts + pkg_name);
*/
} }
}else{ }else{
if (force_configure) if (force_configure)