[vcpkg] Improve error messages during Binary Paragraph parsing

2 files changed, 5 insertions, 3 deletions

diff --git a/toolsrc/src/BinaryParagraph.cpp b/toolsrc/src/BinaryParagraph.cpp
index b6f3e8a87..49e9d58e5 100644
--- a/toolsrc/src/BinaryParagraph.cpp
+++ b/toolsrc/src/BinaryParagraph.cpp
@@ -56,8 +56,10 @@ namespace vcpkg
             this->default_features = parse_comma_list(parser.optional_field(Fields::DEFAULTFEATURES));
         }
 
-        if (auto err = parser.error_info(this->spec.name()))
+        if (auto err = parser.error_info(this->spec.to_string()))
         {
+            System::println(
+                System::Color::error, "Error: while parsing the Binary Paragraph for %s", this->spec.to_string());
             print_error_message(err);
             Checks::exit_fail(VCPKG_LINE_INFO);
         }
diff --git a/toolsrc/src/SourceParagraph.cpp b/toolsrc/src/SourceParagraph.cpp
index 9289edb38..a34167db7 100644
--- a/toolsrc/src/SourceParagraph.cpp
+++ b/toolsrc/src/SourceParagraph.cpp
@@ -54,7 +54,7 @@ namespace vcpkg
             if (!error_info->extra_fields.empty())
             {
                 System::println(System::Color::error,
-                                "Error: There are invalid fields in the Source Paragraph of %s",
+                                "Error: There are invalid fields in the control file of %s",
                                 error_info->name);
                 System::println("The following fields were not expected:\n\n    %s\n",
                                 Strings::join("\n    ", error_info->extra_fields));
@@ -74,7 +74,7 @@ namespace vcpkg
             if (!error_info->missing_fields.empty())
             {
                 System::println(System::Color::error,
-                                "Error: There are missing fields in the Source Paragraphs of %s",
+                                "Error: There are missing fields in the control file of %s",
                                 error_info->name);
                 System::println("The following fields were missing:\n\n    %s\n",
                                 Strings::join("\n    ", error_info->missing_fields));