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

__env__ is now known in the module's global scope.

Browse Source
This commit is contained in:
Pedro Algarvio 2013-11-06 20:30:11 +00:00
parent 1b5e2ff63f
commit fbfd926fdd
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/states/ssh_auth.py
View File

@ -54,7 +54,7 @@ import re
import sys import sys
def _present_test(user, name, enc, comment, options, source, config, env): def _present_test(user, name, enc, comment, options, source, config):
''' '''
Run checks for "present" Run checks for "present"
''' '''
@ -64,7 +64,7 @@ def _present_test(user, name, enc, comment, options, source, config, env):
user, user,
source, source,
config, config,
env) __env__)
if keys: if keys:
comment = '' comment = ''
for key, status in keys.items(): for key, status in keys.items():
@ -168,7 +168,6 @@ def present(
options or [], options or [],
source, source,
config, config,
__env__
) )
return ret return ret
@ -176,8 +175,7 @@ def present(
data = __salt__['ssh.set_auth_key_from_file']( data = __salt__['ssh.set_auth_key_from_file'](
user, user,
source, source,
config, config)
__env__)
else: else:
# check if this is of form {options} {enc} {key} {comment} # check if this is of form {options} {enc} {key} {comment}
sshre = re.compile(r'^(.*?)\s?((?:ssh\-|ecds)[\w-]+\s.+)$') sshre = re.compile(r'^(.*?)\s?((?:ssh\-|ecds)[\w-]+\s.+)$')