Fix download error bug

azure-pipelines/end-to-end-tests-dir/asset-caching.ps1

@@ -55,7 +55,6 @@ $actual = Run-VcpkgAndCaptureOutput -TestArgs ($commonArgs + @("install", "vcpkg
 $actual = $actual -replace "`r`n", "`n"
 
 $expected = @(
-"A suitable version of .* was not found \(required v[0-9\.]+\)."
 "Asset cache miss; downloading from .*"
 "Successfully stored .* to .*."
 ) -join "`n"

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

@@ -248,6 +248,10 @@ DECLARE_MESSAGE(ArtifactsSwitchX86, (), "", "Forces host detection to x86 when a
 DECLARE_MESSAGE(ArtifactsSwitchWindows, (), "", "Forces host detection to Windows when acquiring artifacts")
 DECLARE_MESSAGE(AssetCacheHit, (msg::path, msg::url), "", "Asset cache hit for {path}; downloaded from: {url}")
 DECLARE_MESSAGE(AssetCacheMiss, (msg::url), "", "Asset cache miss; downloading from {url}")
+DECLARE_MESSAGE(AssetCacheMissBlockOrigin,
+ (msg::path),
+ "x-block-origin is a vcpkg term. Do not translate",
+ "Asset cache miss for {path} and downloads are blocked by x-block-origin.")
 DECLARE_MESSAGE(DownloadingUrl, (msg::url), "", "Downloading {url}")
 DECLARE_MESSAGE(AssetCacheProviderAcceptsNoArguments,
  (msg::value),
@@ -1228,10 +1232,6 @@ DECLARE_MESSAGE(MissingShaVariable,
  (),
  "{{sha}} should not be translated",
  "The {{sha}} variable must be used in the template if other variables are used.")
-DECLARE_MESSAGE(AssetCacheMissBlockOrigin,
- (msg::path),
- "x-block-origin is a vcpkg term. Do not translate",
- "Asset cache miss for {path} and downloads are blocked by x-block-origin.")
 DECLARE_MESSAGE(FailedToExtract, (msg::path), "", "Failed to extract \"{path}\":")
 DECLARE_MESSAGE(FailedToFetchRepo, (msg::url), "", "Failed to fetch {url}.")
 DECLARE_MESSAGE(FailedToFindPortFeature,

src/vcpkg/base/downloads.cpp

@@ -936,6 +936,10 @@ namespace vcpkg
  msg::url = replace_secrets(read_url, m_config.m_secrets));
  return read_url;
  }
+ else
+ {
+ msg::println(msgAssetCacheMissBlockOrigin, msg::path = download_path.filename());
+ }
  }
  else if (auto script = m_config.m_script.get())
  {
@@ -1012,11 +1016,6 @@ namespace vcpkg
  }
  }
  }
- // Asset cache is not configured and x-block-origin enabled
- if (m_config.m_read_url_template.has_value())
- {
- msg::println(msgAssetCacheMissBlockOrigin, msg::path = download_path.filename());
- }
  else
  {
  msg::println_error(msgMissingAssetBlockOrigin, msg::path = download_path.filename());