equal
deleted
inserted
replaced
670 # copy selected local settings to the remote ui |
670 # copy selected local settings to the remote ui |
671 for sect in ('auth', 'hostfingerprints', 'http_proxy'): |
671 for sect in ('auth', 'hostfingerprints', 'http_proxy'): |
672 for key, val in src.configitems(sect): |
672 for key, val in src.configitems(sect): |
673 dst.setconfig(sect, key, val, 'copied') |
673 dst.setconfig(sect, key, val, 'copied') |
674 v = src.config('web', 'cacerts') |
674 v = src.config('web', 'cacerts') |
675 if v: |
675 if v == '!': |
|
676 dst.setconfig('web', 'cacerts', v, 'copied') |
|
677 elif v: |
676 dst.setconfig('web', 'cacerts', util.expandpath(v), 'copied') |
678 dst.setconfig('web', 'cacerts', util.expandpath(v), 'copied') |
677 |
679 |
678 return dst |
680 return dst |