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

Lint fixes

Browse Source
This commit is contained in:
Daniel Hobley 2016-03-14 09:32:45 +01:00
parent 55f7ab1fba
commit 4d75b817af
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/mac_keychain.py
View File

@ -242,7 +242,7 @@ def get_hash(name, password=None):
cmd = 'security find-certificate -c "{0}" -m -p'.format(name)
out = __salt__['cmd.run'](cmd)
matches = re.search('-----BEGIN CERTIFICATE-----(.*)-----END CERTIFICATE-----', out, re.DOTALL|re.MULTILINE)
matches = re.search('-----BEGIN CERTIFICATE-----(.*)-----END CERTIFICATE-----', out, re.DOTALL | re.MULTILINE)
if matches:
return matches.group(1)
else:

5
salt/states/mac_keychain.py
View File

@ -75,8 +75,7 @@ def installed(name, password, keychain="/Library/Keychains/System.keychain", **k
out = __salt__['keychain.uninstall'](friendly_name, keychain,
keychain_password=kwargs.get('keychain_password'))
if "unable" not in out:
ret['comment'] += "Found a certificate with the same name but different hash, removing it.\n".\
format(friendly_name)
ret['comment'] += "Found a certificate with the same name but different hash, removing it.\n"
ret['changes']['uninstalled'] = friendly_name
# Reset the certs found
@ -187,4 +186,4 @@ def default_keychain(name, domain="user", user=None):
ret['result'] = False
ret['comment'] = 'Failed to install keychain. {0}'.format(out)
return ret
return ret