mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-18 18:47:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Improve error message when failing to parse package

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-12-05 18:03:36 -08:00
parent e7cbb50f3d
commit 705c8f2012
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
toolsrc/src/vcpkg/packagespec.cpp
View File

@ -2,6 +2,7 @@
#include <vcpkg/base/util.h> #include <vcpkg/base/util.h>
#include <vcpkg/packagespec.h> #include <vcpkg/packagespec.h>
#include <vcpkg/packagespecparseresult.h>
#include <vcpkg/parse.h> #include <vcpkg/parse.h>
using vcpkg::Parse::parse_comma_list; using vcpkg::Parse::parse_comma_list;
@ -95,8 +96,19 @@ namespace vcpkg
std::vector<PackageSpec> PackageSpec::to_package_specs(const std::vector<std::string>& ports, std::vector<PackageSpec> PackageSpec::to_package_specs(const std::vector<std::string>& ports,
const Triplet& triplet) const Triplet& triplet)
{ {
return Util::fmap(ports, [&](const std::string s) { return Util::fmap(ports, [&](const std::string& s) -> PackageSpec {
return PackageSpec::from_name_and_triplet(s, triplet).value_or_exit(VCPKG_LINE_INFO); auto maybe_spec = PackageSpec::from_name_and_triplet(s, triplet);
if (auto spec = maybe_spec.get())
{
return std::move(*spec);
}
const PackageSpecParseResult error_type = maybe_spec.error();
Checks::exit_with_message(VCPKG_LINE_INFO,
"Invalid package: %s\n"
"%s",
s,
vcpkg::to_string(error_type));
}); });
} }