hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Better error messages when parsing version information fails

Browse Source
This commit is contained in:
Sebastian Messmer 2016-03-31 21:18:39 +08:00
parent 4069358b31
commit f5305aa95d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gitversion/parser.cpp
View File

@ -76,12 +76,12 @@ namespace gitversion {
string commitsSinceTag; string commitsSinceTag;
getline(stream, commitsSinceTag, '.'); getline(stream, commitsSinceTag, '.');
if (!stream.good()) { if (!stream.good()) {
throw std::logic_error("Invalid version information: Missing delimiter after commitsSinceTag."); throw std::logic_error("Invalid version information: Missing delimiter after commitsSinceTag (versionInfo: "+versionInfo+").");
} }
string gitCommitId; string gitCommitId;
getline(stream, gitCommitId, '.'); getline(stream, gitCommitId, '.');
if (gitCommitId[0] != 'g') { if (gitCommitId[0] != 'g') {
throw std::logic_error("Invalid version information: Git commit id component doesn't start with 'g'."); throw std::logic_error("Invalid version information: Git commit id component doesn't start with 'g' (versionInfo: "+versionInfo+").");
} }
return std::make_tuple(gitCommitId.substr(1), std::stoul(commitsSinceTag)); return std::make_tuple(gitCommitId.substr(1), std::stoul(commitsSinceTag));
} }