aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/SourceParagraph.cpp
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2016-09-27 15:51:16 -0700
committerRobert Schumacher <roschuma@microsoft.com>2016-09-27 15:51:16 -0700
commitcc29d43f8577be1e053572c83958e633fbbea4e5 (patch)
treeee3d05c01cfb442d0da7a73515093b10892ef23f /toolsrc/src/SourceParagraph.cpp
parent2ed13a583d5c8537680125d2ab5ec77b0f63503c (diff)
parent687ac42cdd39fece9ed816836c049607f8d1223b (diff)
downloadvcpkg-cc29d43f8577be1e053572c83958e633fbbea4e5.tar.gz
vcpkg-cc29d43f8577be1e053572c83958e633fbbea4e5.zip
Merge branch 'master' of https://github.com/microsoft/vcpkg
Diffstat (limited to 'toolsrc/src/SourceParagraph.cpp')
-rw-r--r--toolsrc/src/SourceParagraph.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/toolsrc/src/SourceParagraph.cpp b/toolsrc/src/SourceParagraph.cpp
index 7e3b0403e..374121ae9 100644
--- a/toolsrc/src/SourceParagraph.cpp
+++ b/toolsrc/src/SourceParagraph.cpp
@@ -5,17 +5,16 @@ using namespace vcpkg::details;
vcpkg::SourceParagraph::SourceParagraph() = default;
-vcpkg::SourceParagraph::SourceParagraph(const std::unordered_map<std::string, std::string>& fields)
+vcpkg::SourceParagraph::SourceParagraph(const std::unordered_map<std::string, std::string>& fields):
+ name(required_field(fields, "Source")),
+ version(required_field(fields, "Version")),
+ description(optional_field(fields, "Description")),
+ maintainer(optional_field(fields, "Maintainer"))
{
- required_field(fields, name, "Source");
- required_field(fields, version, "Version");
- optional_field(fields, description, "Description");
- std::string deps;
- optional_field(fields, deps, "Build-Depends");
+ std::string deps = optional_field(fields, "Build-Depends");
if (!deps.empty())
{
- depends.clear();
- parse_depends(deps, depends);
- }
- optional_field(fields, maintainer, "Maintainer");
+ this->depends.clear();
+ this->depends = parse_depends(deps);
+ };
}