diff options
author | Jeremy T. Bouse <jbouse@debian.org> | 2014-08-28 22:23:07 -0700 |
---|---|---|
committer | Jeremy T. Bouse <jbouse@debian.org> | 2014-08-28 22:23:07 -0700 |
commit | 588a4823436454e8968ee36ae95ff92e1cddc3f7 (patch) | |
tree | e4a22fe9360117ca8d4d85d9628d7581a57ac97c /paramiko/config.py | |
parent | 4e426087436d01fe00a120e5e7ce7a5e0a1e0970 (diff) | |
download | python-paramiko-588a4823436454e8968ee36ae95ff92e1cddc3f7.tar python-paramiko-588a4823436454e8968ee36ae95ff92e1cddc3f7.tar.gz |
Imported Upstream version 1.14.1upstream/1.14.1
Diffstat (limited to 'paramiko/config.py')
-rw-r--r-- | paramiko/config.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/paramiko/config.py b/paramiko/config.py index 77fa13d..96ec9ef 100644 --- a/paramiko/config.py +++ b/paramiko/config.py @@ -55,7 +55,7 @@ class SSHConfig (object): """ host = {"host": ['*'], "config": {}} for line in file_obj: - line = line.rstrip('\n').lstrip() + line = line.rstrip('\r\n').lstrip() if (line == '') or (line[0] == '#'): continue if '=' in line: @@ -83,7 +83,7 @@ class SSHConfig (object): #identityfile, localforward, remoteforward keys are special cases, since they are allowed to be # specified multiple times and they should be tried in order # of specification. - + elif key in ['identityfile', 'localforward', 'remoteforward']: if key in host['config']: host['config'][key].append(value) @@ -200,10 +200,12 @@ class SSHConfig (object): for find, replace in replacements[k]: if isinstance(config[k], list): for item in range(len(config[k])): - config[k][item] = config[k][item].\ - replace(find, str(replace)) + if find in config[k][item]: + config[k][item] = config[k][item].\ + replace(find, str(replace)) else: - config[k] = config[k].replace(find, str(replace)) + if find in config[k]: + config[k] = config[k].replace(find, str(replace)) return config |