Mercurial > public > mercurial-scm > hg-stable
diff mercurial/sslutil.py @ 32313:2e455cbeac50
sslutil: tweak the legacy [hostfingerprints] warning message
Lars Rohwedder noted in issue5559 that the previous wording was
confusing. I agree.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Wed, 10 May 2017 23:49:37 -0700 |
parents | e05cfb4a6a8e |
children | bd872f64a8ba |
line wrap: on
line diff
--- a/mercurial/sslutil.py Thu May 11 11:37:18 2017 -0700 +++ b/mercurial/sslutil.py Wed May 10 23:49:37 2017 -0700 @@ -807,13 +807,11 @@ if settings['legacyfingerprint']: ui.warn(_('(SHA-1 fingerprint for %s found in legacy ' '[hostfingerprints] section; ' - 'if you trust this fingerprint, set the ' - 'following config value in [hostsecurity] and ' - 'remove the old one from [hostfingerprints] ' - 'to upgrade to a more secure SHA-256 ' - 'fingerprint: ' - '%s:fingerprints=%s)\n') % ( - host, host, nicefingerprint)) + 'if you trust this fingerprint, remove the old ' + 'SHA-1 fingerprint from [hostfingerprints] and ' + 'add the following entry to the new ' + '[hostsecurity] section: %s:fingerprints=%s)\n') % + (host, host, nicefingerprint)) return # Pinned fingerprint didn't match. This is a fatal error.