Merge pull request #1461 from Microsoft/create_install_tests

feature packages graph algorithm

1 files changed, 6 insertions, 21 deletions

diff --git a/toolsrc/src/vcpkg_Input.cpp b/toolsrc/src/vcpkg_Input.cpp
index fdedd5507..f4e9a07c2 100644
--- a/toolsrc/src/vcpkg_Input.cpp
+++ b/toolsrc/src/vcpkg_Input.cpp
@@ -12,10 +12,10 @@ namespace vcpkg::Input
                                            CStringView example_text)
     {
         const std::string as_lowercase = Strings::ascii_to_lowercase(package_spec_as_string);
-        auto expected_spec = PackageSpec::from_string(as_lowercase, default_triplet);
+        auto expected_spec = FullPackageSpec::from_string(as_lowercase, default_triplet);
         if (auto spec = expected_spec.get())
         {
-            return PackageSpec{*spec};
+            return PackageSpec{spec->package_spec};
         }
 
         // Intentionally show the lowercased string
@@ -39,26 +39,11 @@ namespace vcpkg::Input
                                                     const Triplet& default_triplet,
                                                     CStringView example_text)
     {
-        int left_pos = (int)full_package_spec_as_string.find('[');
-        if (left_pos == std::string::npos)
-        {
-            return FullPackageSpec{
-                check_and_get_package_spec(full_package_spec_as_string, default_triplet, example_text)};
-        }
-        int right_pos = (int)full_package_spec_as_string.find(']');
-        if (left_pos >= right_pos)
-        {
-            System::println(System::Color::error, "Error: Argument is not formatted correctly \"%s\"");
-            Checks::exit_fail(VCPKG_LINE_INFO);
-        }
-
-        std::string package_spec_as_string = full_package_spec_as_string.substr(0, left_pos);
-        const std::string as_lowercase = Strings::ascii_to_lowercase(package_spec_as_string);
-        auto expected_spec = PackageSpec::from_string(as_lowercase, default_triplet);
-        if (auto&& spec = expected_spec.get())
+        const std::string as_lowercase = Strings::ascii_to_lowercase(full_package_spec_as_string);
+        auto expected_spec = FullPackageSpec::from_string(as_lowercase, default_triplet);
+        if (auto spec = expected_spec.get())
         {
-            return {*spec,
-                    parse_comma_list(full_package_spec_as_string.substr(left_pos + 1, right_pos - left_pos - 1))};
+            return *spec;
         }
 
         // Intentionally show the lowercased string