loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Simplified handling of parsing errors during masterlist update.

Browse Source
This commit is contained in:
WrinklyNinja
2013-08-01 21:53:18 +01:00
parent 47ffc74ce4
commit 975cb5144b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/network.cpp
+3 -3
View File
@@ -193,7 +193,7 @@ namespace boss {
throw boss::error(boss::error::git_error, error_message);
}
std::string UpdateMasterlist(Game& game, std::vector<std::string>& parsingErrors, std::list<Plugin>& plugins, std::list<Message>& messages) {
std::string UpdateMasterlist(Game& game, std::list<Message>& parsingErrors, std::list<Plugin>& plugins, std::list<Message>& messages) {
//First need to decide how the masterlist is updated: using Git or Subversion?
//Look at the update URL to decide.
@@ -301,7 +301,7 @@ namespace boss {
//Roll back one revision if there's an error.
BOOST_LOG_TRIVIAL(error) << "Masterlist parsing failed. Masterlist revision " + revision + ": " + e.what();
parsingErrors.push_back("Masterlist revision " + revision + ": " + e.what());
parsingErrors.push_back(boss::Message(boss::g_message_error, "Masterlist revision " + revision + ": " + e.what()));
command = g_path_svn.string() + " update --revision PREV \"" + game.MasterlistPath().string() + "\"";
@@ -548,7 +548,7 @@ namespace boss {
//Roll back one revision if there's an error.
BOOST_LOG_TRIVIAL(error) << "Masterlist parsing failed. Masterlist revision " + string(revision) + ": " + e.what();
parsingErrors.push_back("Masterlist revision " + string(revision) + ": " + e.what());
parsingErrors.push_back(boss::Message(boss::g_message_error, "Masterlist revision " + string(revision) + ": " + e.what()));
}
} while (parsingFailed);
src/backend/network.h
+1 -1
View File
@@ -63,6 +63,6 @@ namespace boss {
So when using Git, the Game::URL() function would return the path to the repository, and BOSS would expect that the masterlist be in the root directory of the repository, which is not unreasonable.
*/
std::string UpdateMasterlist(Game& game, std::vector<std::string>& parsingErrors, std::list<Plugin>& plugins, std::list<Message>& messages);
std::string UpdateMasterlist(Game& game, std::list<Message>& parsingErrors, std::list<Plugin>& plugins, std::list<Message>& messages);
}
#endif