diff options
| author | Tobias Kohlbau <tobias@kohlbau.de> | 2017-03-28 10:48:26 +0200 |
|---|---|---|
| committer | Tobias Kohlbau <tobias@kohlbau.de> | 2017-03-28 10:51:53 +0200 |
| commit | a9aaead2d19c60a51edbaaddd97b745c51714220 (patch) | |
| tree | e0632fa068b11edd4be13e1ee191d65616a4cffb /toolsrc/src/vcpkglib.cpp | |
| parent | 4fbcf0df4dd14176eda7d686bf122d0b65c0585a (diff) | |
| parent | a1cfa18481f9ea0f7eaaaeb34832d89c51f5f4f1 (diff) | |
| download | vcpkg-a9aaead2d19c60a51edbaaddd97b745c51714220.tar.gz vcpkg-a9aaead2d19c60a51edbaaddd97b745c51714220.zip | |
Merge branch 'master' of github.com:Microsoft/vcpkg into opencv_contrib
Diffstat (limited to 'toolsrc/src/vcpkglib.cpp')
| -rw-r--r-- | toolsrc/src/vcpkglib.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/toolsrc/src/vcpkglib.cpp b/toolsrc/src/vcpkglib.cpp index 932502d2d..204e1c0d7 100644 --- a/toolsrc/src/vcpkglib.cpp +++ b/toolsrc/src/vcpkglib.cpp @@ -22,8 +22,7 @@ namespace vcpkg fs::rename(vcpkg_dir_status_file_old, vcpkg_dir_status_file); } - auto text = Files::read_contents(vcpkg_dir_status_file).get_or_throw(VCPKG_LINE_INFO); - auto pghs = Paragraphs::parse_paragraphs(text); + auto pghs = Paragraphs::get_paragraphs(vcpkg_dir_status_file).get_or_throw(VCPKG_LINE_INFO); std::vector<std::unique_ptr<StatusParagraph>> status_pghs; for (auto&& p : pghs) @@ -65,8 +64,7 @@ namespace vcpkg if (b->path().filename() == "incomplete") continue; - auto text = Files::read_contents(b->path()).get_or_throw(VCPKG_LINE_INFO); - auto pghs = Paragraphs::parse_paragraphs(text); + auto pghs = Paragraphs::get_paragraphs(b->path()).get_or_throw(VCPKG_LINE_INFO); for (auto&& p : pghs) { current_status_db.insert(std::make_unique<StatusParagraph>(p)); |