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

Only remove the pending key if it exists

Browse Source
This commit is contained in:
K Jonathan Harker 2012-10-26 23:24:37 +00:00
parent d3edc88bae
commit 5f866ad9f1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
saltcloud/utils/__init__.py
View File

@ -98,9 +98,10 @@ def accept_key(pki_dir, pub, id_):
pki_dir,
'minions_pre/{0}'.format(id_)
)
with open(oldkey) as fp_:
if fp_.read() == pub:
os.remove(oldkey)
if os.path.isfile(oldkey):
with open(oldkey) as fp_:
if fp_.read() == pub:
os.remove(oldkey)
def remove_key(pki_dir, id_):