valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing failed unittest and making PEP compliant

Browse Source
This commit is contained in:
Damian Myerscough 2014-01-03 22:55:52 +01:00
parent 84afd7b230
commit 2e68e3ad4a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/modules/ssh.py
View File

@ -303,8 +303,9 @@ def check_key(user, key, enc, comment, options, config='.ssh/authorized_keys',
current = auth_keys(user, config)
nline = _format_auth_line(key, enc, comment, options)
for pub_key in set(current).difference(set(cache_keys)):
rm_auth_key(user, pub_key)
if cache_keys:
for pub_key in set(current).difference(set(cache_keys)):
rm_auth_key(user, pub_key)
if key in current:
cline = _format_auth_line(key,
@ -387,10 +388,10 @@ def rm_auth_key(user, key, config='.ssh/authorized_keys'):
def set_auth_key_from_file(user,
source,
config='.ssh/authorized_keys',
saltenv='base',
env=None):
source,
config='.ssh/authorized_keys',
saltenv='base',
env=None):
'''
Add a key to the authorized_keys file, using a file as the source.