aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/vcpkg_Input.cpp
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-04-11 18:15:52 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-04-11 18:24:08 -0700
commit7326b6c64dc6b04b6d8512f13dddf67bf7498bf1 (patch)
treee6c095b1c26d0689730efe5f274bbeeb1090e57f /toolsrc/src/vcpkg_Input.cpp
parent0bc21296c9ef32412237a8cc0c8141d0226b9070 (diff)
parent92c0a91d3fdd9a9df5d3feae611981ea170703f5 (diff)
downloadvcpkg-7326b6c64dc6b04b6d8512f13dddf67bf7498bf1.tar.gz
vcpkg-7326b6c64dc6b04b6d8512f13dddf67bf7498bf1.zip
Merge from master
Diffstat (limited to 'toolsrc/src/vcpkg_Input.cpp')
-rw-r--r--toolsrc/src/vcpkg_Input.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/toolsrc/src/vcpkg_Input.cpp b/toolsrc/src/vcpkg_Input.cpp
index d66065cc2..1e74f2e90 100644
--- a/toolsrc/src/vcpkg_Input.cpp
+++ b/toolsrc/src/vcpkg_Input.cpp
@@ -6,10 +6,10 @@
namespace vcpkg::Input
{
- PackageSpec check_and_get_package_spec(const std::string& package_spec_as_string, const Triplet& default_target_triplet, CStringView example_text)
+ PackageSpec check_and_get_package_spec(const std::string& package_spec_as_string, const Triplet& default_triplet, CStringView example_text)
{
const std::string as_lowercase = Strings::ascii_to_lowercase(package_spec_as_string);
- Expected<PackageSpec> expected_spec = PackageSpec::from_string(as_lowercase, default_target_triplet);
+ Expected<PackageSpec> expected_spec = PackageSpec::from_string(as_lowercase, default_triplet);
if (auto spec = expected_spec.get())
{
return *spec;
@@ -25,8 +25,8 @@ namespace vcpkg::Input
{
if (!paths.is_valid_triplet(t))
{
- System::println(System::Color::error, "Error: invalid triplet: %s", t.canonical_name());
- Metrics::track_property("error", "invalid triplet: " + t.canonical_name());
+ System::println(System::Color::error, "Error: invalid triplet: %s", t);
+ Metrics::track_property("error", "invalid triplet: " + t.to_string());
Commands::Help::help_topic_valid_triplet(paths);
Checks::exit_fail(VCPKG_LINE_INFO);
}