Fix doubled warnings being printed for manifest warnings when loading ports. (#1466)

Author: BillyONeal

azure-pipelines/e2e-ports/vcpkg-bad-spdx-license/portfile.cmake

@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

azure-pipelines/e2e-ports/vcpkg-bad-spdx-license/vcpkg.json

@@ -0,0 +1,5 @@
+{
+  "name": "vcpkg-bad-spdx-license",
+  "version": "1",
+  "license": "BSD-new"
+}

azure-pipelines/end-to-end-tests-dir/build-test-ports.ps1

@@ -60,3 +60,19 @@ Throw-IfFailed
 if ($output -notmatch 'vcpkg-internal-e2e-test-port3:[^ ]+ is already installed -- not building from HEAD') {
     throw 'Wrong already installed message for --head'
 }
+
+Refresh-TestRoot
+$output = Run-VcpkgAndCaptureOutput @commonArgs --x-builtin-ports-root="$PSScriptRoot/../e2e-ports" install vcpkg-bad-spdx-license
+Throw-IfFailed
+$output = $output.Replace("`r`n", "`n")
+$expected = @"
+vcpkg.json: warning: $.license (an SPDX license expression): warning: Unknown license identifier 'BSD-new'. Known values are listed at https://spdx.org/licenses/
+  on expression: BSD-new
+                 ^
+"@
+$firstMatch = $output.IndexOf($expected)
+if ($firstMatch -lt 0) {
+    throw 'Did not detect expected bad license'
+} elseif ($output.IndexOf($expected, $firstMatch + 1) -ge 0) {
+    throw 'Duplicated bad license'
+}

include/vcpkg/base/message-data.inc.h

@@ -3033,10 +3033,6 @@ DECLARE_MESSAGE(VersionMissingRequiredFeature,
                 (msg::version_spec, msg::feature, msg::constraint_origin),
                 "",
                 "{version_spec} does not have required feature {feature} needed by {constraint_origin}")
-DECLARE_MESSAGE(VersionNotFound,
-                (msg::expected, msg::actual),
-                "{expected} and {actual} are versions",
-                "{expected} not available, only {actual} is available")
 DECLARE_MESSAGE(VersionNotFoundInVersionsFile2,
                 (msg::version_spec),
                 "",

include/vcpkg/metrics.h

@@ -37,7 +37,7 @@ namespace vcpkg
         VcpkgDefaultBinaryCache,
         VcpkgNugetRepository,
         VersioningErrorBaseline,
-        VersioningErrorVersion,
+        VersioningErrorVersion, // no longer used
         X_VcpkgRegistriesCache,
         X_WriteNugetPackagesConfig,
         COUNT // always keep COUNT last

include/vcpkg/paragraphs.h

@@ -58,10 +58,8 @@ namespace vcpkg::Paragraphs
         std::vector<std::pair<std::string, LocalizedString>> errors;
     };
 
-    LoadResults try_load_all_registry_ports(const ReadOnlyFilesystem& fs, const RegistrySet& registries);
-
-    std::vector<SourceControlFileAndLocation> load_all_registry_ports(const ReadOnlyFilesystem& fs,
-                                                                      const RegistrySet& registries);
+    LoadResults try_load_all_registry_ports(const RegistrySet& registries);
+    std::vector<SourceControlFileAndLocation> load_all_registry_ports(const RegistrySet& registries);
 
     LoadResults try_load_overlay_ports(const ReadOnlyFilesystem& fs, const Path& dir);
     std::vector<SourceControlFileAndLocation> load_overlay_ports(const ReadOnlyFilesystem& fs, const Path& dir);

include/vcpkg/portfileprovider.h

@@ -63,8 +63,7 @@ namespace vcpkg
 
     struct PathsPortFileProvider : PortFileProvider
     {
-        explicit PathsPortFileProvider(const ReadOnlyFilesystem& fs,
-                                       const RegistrySet& registry_set,
+        explicit PathsPortFileProvider(const RegistrySet& registry_set,
                                        std::unique_ptr<IFullOverlayProvider>&& overlay);
         ExpectedL<const SourceControlFileAndLocation&> get_control_file(const std::string& src_name) const override;
         std::vector<const SourceControlFileAndLocation*> load_all_control_files() const override;
@@ -76,8 +75,7 @@ namespace vcpkg
     };
 
     std::unique_ptr<IBaselineProvider> make_baseline_provider(const RegistrySet& registry_set);
-    std::unique_ptr<IFullVersionedPortfileProvider> make_versioned_portfile_provider(const ReadOnlyFilesystem& fs,
-                                                                                     const RegistrySet& registry_set);
+    std::unique_ptr<IFullVersionedPortfileProvider> make_versioned_portfile_provider(const RegistrySet& registry_set);
     std::unique_ptr<IFullOverlayProvider> make_overlay_provider(const ReadOnlyFilesystem& fs,
                                                                 const Path& original_cwd,
                                                                 View<std::string> overlay_ports);

include/vcpkg/registries.h

@@ -58,7 +58,7 @@ namespace vcpkg
     {
         virtual ExpectedL<View<Version>> get_port_versions() const = 0;
 
-        virtual ExpectedL<PortLocation> get_version(const Version& version) const = 0;
+        virtual ExpectedL<SourceControlFileAndLocation> try_load_port(const Version& version) const = 0;
 
         virtual ~RegistryEntry() = default;
     };

include/vcpkg/sourceparagraph.h

@@ -210,6 +210,17 @@ namespace vcpkg
         VersionSpec to_version_spec() const { return source_control_file->to_version_spec(); }
         Path port_directory() const { return control_path.parent_path(); }
 
+        SourceControlFileAndLocation clone() const
+        {
+            std::unique_ptr<SourceControlFile> scf;
+            if (source_control_file)
+            {
+                scf = std::make_unique<SourceControlFile>(source_control_file->clone());
+            }
+
+            return SourceControlFileAndLocation{std::move(scf), control_path, spdx_location};
+        }
+
         std::unique_ptr<SourceControlFile> source_control_file;
         Path control_path;
 

locales/messages.json

@@ -1613,8 +1613,6 @@
   "_VersionMissing.comment": "The names version, version-date, version-semver, and version-string are code and must not be localized",
   "VersionMissingRequiredFeature": "{version_spec} does not have required feature {feature} needed by {constraint_origin}",
   "_VersionMissingRequiredFeature.comment": "An example of {version_spec} is zlib:[email protected]. An example of {feature} is avisynthplus. An example of {constraint_origin} is zlib:[email protected].",
-  "VersionNotFound": "{expected} not available, only {actual} is available",
-  "_VersionNotFound.comment": "{expected} and {actual} are versions",
   "VersionNotFoundInVersionsFile2": "{version_spec} was not found in versions database",
   "_VersionNotFoundInVersionsFile2.comment": "An example of {version_spec} is zlib:[email protected].",
   "VersionNotFoundInVersionsFile3": "the version should be in this file",