Merge branch 'main' into 'main'

Also support debian-ports modernization

See merge request apt-team/apt!443

1 files changed, 1 insertions, 1 deletions

diff --git a/apt-private/private-sources.cc b/apt-private/private-sources.cc
index 84d82af33..a23955ab5 100644
--- a/apt-private/private-sources.cc
+++ b/apt-private/private-sources.cc
@@ -189,7 +189,7 @@ static bool Modernize(std::string const &filename) /*{{{*/
       if (e.signedBy.empty() && not meta->GetOrigin().empty())
       {
 	 std::string dir = _config->FindDir("Dir") + std::string{"usr/share/keyrings/"};
-	 std::string keyring = meta->GetOrigin() + "-archive-keyring.gpg";
+	 std::string keyring = std::regex_replace(meta->GetOrigin(), std::regex(" "), "-") + "-archive-keyring.gpg";
 	 std::transform(keyring.begin(), keyring.end(), keyring.begin(), tolower);
 	 if (FileExists(dir + keyring))
 	    e.signedBy = dir + keyring;