From d1b6b04169cbc7498cb00b12d79e74d41c3d037d Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 19 Dec 2014 22:09:04 +0100 Subject: [PATCH] COPKGManager: defuse error message for duplicate cache option Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/7acdf65e6504880125957b6c274224df31732bd4 Author: Thilo Graf Date: 2014-12-19 (Fri, 19 Dec 2014) --- src/gui/opkg_manager.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/gui/opkg_manager.cpp b/src/gui/opkg_manager.cpp index 3044d8295..ec3a2375f 100644 --- a/src/gui/opkg_manager.cpp +++ b/src/gui/opkg_manager.cpp @@ -621,6 +621,11 @@ void COPKGManager::handleShellOutput(string& cur_line) size_t pos01 = cur_line.find("wget returned 4"); if (pos01 != string::npos) err_msg = "Network error! Online update not possible. Please check your network connection!\n"; + + //duplicate option cache: option is defined in OPKG_CL_CONFIG_OPTIONS, NOTE: if found first cache option in the opkg.conf file, this will be preferred + pos01 = cur_line.find("Duplicate option cache"); + if (pos01 != string::npos) + has_err = false; }else{ size_t pos2 = cur_line.find("Collected errors:"); if (pos2 != string::npos)