From 830bd8d44967ba488bd6cb5d18f227e7709b7881 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 29 Mar 2017 09:49:09 -0700 Subject: [PATCH] [vcpkg] Fix regression introduced in 67ce764. Fixes #868. Fixes #866. --- toolsrc/src/vcpkg.cpp | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index 069d9a7c1..2b57db484 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -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 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 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 (...) {