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

Issue #31: Added check for and correction of repository URL.

Browse Source
This commit is contained in:
WrinklyNinja
2013-07-31 21:05:45 +01:00
parent 218fc27659
commit 10f907b832
1 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/network.cpp
+37
View File
@@ -141,6 +141,19 @@ namespace boss {
return revision + " (" + date + ")";
}
//Gets repository URL string.
string GetURL(const std::string& buffer) {
size_t pos1, pos2;
pos1 = buffer.rfind("Repository Root: ");
if (pos1 == string::npos)
return "";
pos2 = buffer.find('\n', pos1);
return buffer.substr(pos1+17, pos2-pos1-17);
}
std::string UpdateMasterlist(Game& game, std::vector<std::string>& parsingErrors) {
string command, output, revision;
@@ -167,6 +180,30 @@ namespace boss {
BOOST_LOG_TRIVIAL(error) << "Subversion could not perform a checkout. Details: " << output;
throw error(error::subversion_error, "Subversion could not perform a checkout. Details: " + output);
}
} else {
//A working copy exists, but we need to make sure that it points to the right repository.
BOOST_LOG_TRIVIAL(trace) << "Comparing working copy repository URL with BOSS's URL";
command = g_path_svn.string() + " info \"" + game.MasterlistPath().string() + "\"";
if (!RunCommand(command, output)) {
BOOST_LOG_TRIVIAL(error) << "Subversion could not get the repository URL. Details: " << output;
throw error(error::subversion_error, "Subversion could not get the repository URL. Details: " + output);
}
string url = GetURL(output);
//Now compare URLs.
if (url != game.URL()) {
BOOST_LOG_TRIVIAL(trace) << "URLs do not match: relocating the working copy.";
command = g_path_svn.string() + " relocate " + game.URL();
if (!RunCommand(command, output)) {
BOOST_LOG_TRIVIAL(error) << "Subversion could not relocate the working copy. Details: " << output;
throw error(error::subversion_error, "Subversion could not relocate the working copy. Details: " + output);
}
}
}
//Now update masterlist.