Merge branch 'master' of github.com:Microsoft/vcpkg into opencv_contrib

1 files changed, 4 insertions, 15 deletions

diff --git a/toolsrc/src/commands_cache.cpp b/toolsrc/src/commands_cache.cpp
index 417799abb..6504c8c4d 100644
--- a/toolsrc/src/commands_cache.cpp
+++ b/toolsrc/src/commands_cache.cpp
@@ -13,22 +13,11 @@ namespace vcpkg::Commands::Cache
         for (auto it = fs::directory_iterator(paths.packages); it != fs::directory_iterator(); ++it)
         {
             const fs::path& path = it->path();
-
-            try
-            {
-                auto file_contents = Files::read_contents(path / "CONTROL");
-                if (auto text = file_contents.get())
-                {
-                    auto pghs = Paragraphs::parse_paragraphs(*text);
-                    if (pghs.size() != 1)
-                        continue;
-
-                    const BinaryParagraph binary_paragraph = BinaryParagraph(pghs[0]);
-                    output.push_back(binary_paragraph);
-                }
-            }
-            catch (std::runtime_error const&)
+            const expected<std::unordered_map<std::string, std::string>> pghs = Paragraphs::get_single_paragraph(path / "CONTROL");
+            if (auto p = pghs.get())
             {
+                const BinaryParagraph binary_paragraph = BinaryParagraph(*p);
+                output.push_back(binary_paragraph);
             }
         }