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

COPKGManager: use shell output to generate error messages for gui

Browse Source
This commit is contained in:
Thilo Graf
2014-11-24 09:06:33 +01:00
parent 6feca09a07
commit 524b91a402
2 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/gui/opkg_manager.cpp
View File

@@ -271,12 +271,14 @@ bool COPKGManager::hasUpdates()
return ret; return ret;
} }
void COPKGManager::doUpdate() int COPKGManager::doUpdate()
{ {
int r = execCmd(pkg_types[OM_UPDATE]); int r = execCmd(pkg_types[OM_UPDATE]);
if (r) { if (r == -1) {
showError(g_Locale->getText(LOCALE_OPKG_FAILURE_UPDATE), strerror(errno), pkg_types[OM_UPDATE]); DisplayErrorMessage(g_Locale->getText(LOCALE_OPKG_FAILURE_UPDATE));
// showError(g_Locale->getText(LOCALE_OPKG_FAILURE_UPDATE), strerror(errno), pkg_types[OM_UPDATE]);
} }
return r;
} }
void COPKGManager::refreshMenu() { void COPKGManager::refreshMenu() {
@@ -428,26 +430,55 @@ string COPKGManager::getBlankPkgName(const string& line)
int COPKGManager::execCmd(const char *cmdstr, bool verbose, bool acknowledge) int COPKGManager::execCmd(const char *cmdstr, bool verbose, bool acknowledge)
{ {
fprintf(stderr, "execCmd(%s)\n", cmdstr); fprintf(stderr, "execCmd(%s)\n", cmdstr);
string cmd(cmdstr); string cmd = string(cmdstr);
int res = 0;
bool has_err = false;
string err_msg = "";
if (verbose) { if (verbose) {
cmd += " 2>&1"; cmd += " 2>&1";
int res;
CShellWindow(cmd, (verbose ? CShellWindow::VERBOSE : 0) | (acknowledge ? CShellWindow::ACKNOWLEDGE_MSG : 0), &res); CShellWindow(cmd, (verbose ? CShellWindow::VERBOSE : 0) | (acknowledge ? CShellWindow::ACKNOWLEDGE_MSG : 0), &res);
return res;
} else { } else {
cmd += " 2>/dev/null >&2"; cmd += " 2>&1";
int r = my_system(3, "/bin/sh", "-c", cmd.c_str()); pid_t pid = 0;
if (r == -1) FILE *f = my_popen(pid, cmd.c_str(), "r");
return r; if (!f) {
return WEXITSTATUS(r); showError("OPKG-Error!", strerror(errno), cmd);
return -1;
}
char buf[256];
while (fgets(buf, sizeof(buf), f))
{
string line(buf);
trim(line);
dprintf(DEBUG_INFO, "[neutrino opkg] %s [error %d]\n", line.c_str(), has_err);
//check for collected errors and build a message for screen if errors available
if (has_err){
dprintf(DEBUG_NORMAL, "[neutrino opkg] %s \n", line.c_str());
size_t pos1 = line.find(" * opkg_");
string str = line.substr(pos1, line.length()-pos1);
err_msg += str.replace(pos1, 8,"") + "\n";
}else{
size_t pos2 = line.find("Collected errors:");
if (pos2 != string::npos)
has_err = true;
}
}
fclose(f);
} }
if (has_err){
DisplayErrorMessage(err_msg.c_str());
return -1;
}
return res;
} }
void COPKGManager::showError(const char* local_msg, char* sys_msg, const string& command) void COPKGManager::showError(const char* local_msg, char* err_msg, const string& command)
{ {
string msg = local_msg ? string(local_msg) + "\n" : ""; string msg = local_msg ? string(local_msg) + "\n" : "";
msg += string(sys_msg) + ":\n"; msg += string(err_msg) + ":\n";
msg += command; msg += command;
DisplayErrorMessage(msg.c_str()); DisplayErrorMessage(msg.c_str());
} }

4
src/gui/opkg_manager.h
View File

@@ -68,8 +68,8 @@ class COPKGManager : public CMenuTarget
void updateMenu(); void updateMenu();
void refreshMenu(); void refreshMenu();
bool badpackage(std::string &s); bool badpackage(std::string &s);
void showError(const char* local_msg, char* sys_msg, const std::string& command); void showError(const char* local_msg, char* err_msg, const std::string& command);
void doUpdate(); int doUpdate();
struct pkg { struct pkg {
std::string name; std::string name;