3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-29 03:34:26 +08:00
Code Issues Projects Releases Wiki Activity

[vcpkg] Fix regression introduced in 67ce764. Fixes #868. Fixes #866.

Browse Source
This commit is contained in:
Robert Schumacher 2017-03-29 09:49:09 -07:00
parent c09a8f990c
commit 830bd8d449
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
toolsrc/src/vcpkg.cpp
View File

@ -111,23 +111,28 @@ static void loadConfig()
try
{
auto pghs = Paragraphs::get_paragraphs(localappdata / "vcpkg" / "config").get_or_exit(VCPKG_LINE_INFO);
std::unordered_map<std::string, std::string> keys;
if (pghs.size() > 0)
keys = pghs[0];
for (size_t x = 1; x < pghs.size(); ++x)
auto maybe_pghs = Paragraphs::get_paragraphs(localappdata / "vcpkg" / "config");
if (auto p_pghs = maybe_pghs.get())
{
for (auto&& p : pghs[x])
keys.insert(p);
const auto& pghs = *p_pghs;
std::unordered_map<std::string, std::string> keys;
if (pghs.size() > 0)
keys = pghs[0];
for (size_t x = 1; x < pghs.size(); ++x)
{
for (auto&& p : pghs[x])
keys.insert(p);
}
auto user_id = keys["User-Id"];
auto user_time = keys["User-Since"];
Checks::check_throw(VCPKG_LINE_INFO, !user_id.empty() && !user_time.empty(), ""); // Use as goto to the catch statement
SetUserInformation(user_id, user_time);
return;
}
auto user_id = keys["User-Id"];
auto user_time = keys["User-Since"];
Checks::check_throw(VCPKG_LINE_INFO, !user_id.empty() && !user_time.empty(), ""); // Use as goto to the catch statement
SetUserInformation(user_id, user_time);
return;
}
catch (...)
{