saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #24994 from garethgreenaway/2015_5_24862_gpg_import_key

Browse source 
Another Fix to gpg.py in 2015.5
This commit is contained in:
Justin Findlay 2015-06-27 16:28:15 -06:00
commit e9aaa11b68
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/modules/gpg.py
View file

@ -614,9 +614,6 @@ def import_key(user=None,
# include another check for Salt unit tests
gnupg_version = distutils.version.LooseVersion(gnupg.__version__)
if gnupg_version >= '1.3.1':
GPG_1_3_1 = True
if GPG_1_3_1:
counts = imported_data.counts
if counts.get('imported') or counts.get('imported_rsa'):
ret['message'] = 'Successfully imported key(s).'