Merge branch 'feature_package_implementation'

1 files changed, 8 insertions, 8 deletions

diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg_Dependencies.cpp
index f32d92f4c..add8acb4d 100644
--- a/toolsrc/src/vcpkg_Dependencies.cpp
+++ b/toolsrc/src/vcpkg_Dependencies.cpp
@@ -174,12 +174,12 @@ namespace vcpkg::Dependencies
                 if (auto bpgh = maybe_bpgh.get())
                     return InstallPlanAction{spec, {nullopt, *bpgh, nullopt}, request_type};
 
-                ExpectedT<SourceParagraph, ParseControlErrorInfo> maybe_spgh =
+                ExpectedT<SourceControlFile, ParseControlErrorInfo> source_control_file =
                     Paragraphs::try_load_port(paths.get_filesystem(), paths.port_dir(spec));
-                if (auto spgh = maybe_spgh.get())
-                    return InstallPlanAction{spec, {nullopt, nullopt, *spgh}, request_type};
+                if (auto scf = source_control_file.get())
+                    return InstallPlanAction{spec, {nullopt, nullopt, (*scf).core_paragraph}, request_type};
 
-                print_error_message(maybe_spgh.error());
+                print_error_message(source_control_file.error());
                 Checks::exit_fail(VCPKG_LINE_INFO);
             }
         };
@@ -284,13 +284,13 @@ namespace vcpkg::Dependencies
                 if (auto bpgh = maybe_bpgh.get())
                     return ExportPlanAction{spec, {nullopt, *bpgh, nullopt}, request_type};
 
-                ExpectedT<SourceParagraph, ParseControlErrorInfo> maybe_spgh =
+                ExpectedT<SourceControlFile, ParseControlErrorInfo> source_control_file =
                     Paragraphs::try_load_port(paths.get_filesystem(), paths.port_dir(spec));
-                if (auto spgh = maybe_spgh.get())
-                    return ExportPlanAction{spec, {nullopt, nullopt, *spgh}, request_type};
+                if (auto scf = source_control_file.get())
+                    return ExportPlanAction{spec, {nullopt, nullopt, (*scf).core_paragraph}, request_type};
 
                 else
-                    print_error_message(maybe_spgh.error());
+                    print_error_message(source_control_file.error());
 
                 Checks::exit_with_message(VCPKG_LINE_INFO, "Could not find package %s", spec);
             }