##// END OF EJS Templates
sslutil: some more forcebytes() on some exception messages...
Augie Fackler -
r36762:4c71a26a default
parent child Browse files
Show More
@@ -346,10 +346,11 b' def wrapsocket(sock, keyfile, certfile, '
346 346
347 347 for f in (keyfile, certfile):
348 348 if f and not os.path.exists(f):
349 raise error.Abort(_('certificate file (%s) does not exist; '
350 'cannot connect to %s') % (f, serverhostname),
351 hint=_('restore missing file or fix references '
352 'in Mercurial config'))
349 raise error.Abort(
350 _('certificate file (%s) does not exist; cannot connect to %s')
351 % (f, pycompat.bytesurl(serverhostname)),
352 hint=_('restore missing file or fix references '
353 'in Mercurial config'))
353 354
354 355 settings = _hostsettings(ui, serverhostname)
355 356
@@ -372,9 +373,10 b' def wrapsocket(sock, keyfile, certfile, '
372 373 try:
373 374 sslcontext.set_ciphers(pycompat.sysstr(settings['ciphers']))
374 375 except ssl.SSLError as e:
375 raise error.Abort(_('could not set ciphers: %s') % e.args[0],
376 hint=_('change cipher string (%s) in config') %
377 settings['ciphers'])
376 raise error.Abort(
377 _('could not set ciphers: %s') % util.forcebytestr(e.args[0]),
378 hint=_('change cipher string (%s) in config') %
379 settings['ciphers'])
378 380
379 381 if certfile is not None:
380 382 def password():
General Comments 0
You need to be logged in to leave comments. Login now