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

Fix #1332

Browse Source
This commit is contained in:
Thomas S Hatch 2012-05-23 19:52:59 -06:00
parent fa32dc78ec
commit da5c356806
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/crypt.py
View File

@ -44,7 +44,13 @@ def clean_old_key(rsa_path):
import win32api
import win32con
win32api.SetFileAttributes(rsa_path, win32con.FILE_ATTRIBUTE_NORMAL)
mkey.save_key(rsa_path, None)
try:
mkey.save_key(rsa_path, None)
except IOError:
log.error(
('Failed to update old RSA format for key {0}, future '
'releases may not be able to use this key').format(rsa_path)
)
# Set read-only permission for minion.pem file
if sys.platform == 'win32':
import win32api