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

Pylint fix

Browse Source
This commit is contained in:
rallytime 2016-03-30 16:05:03 -06:00
parent fa5e17b342
commit 3a0987c7c1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/states/pkgrepo.py
View File

@ -85,7 +85,10 @@ these states. Here is some example SLS:
installed if it is not present.
'''
# Import Python libs
from __future__ import absolute_import
import sys
# Import salt libs
import salt.utils
@ -266,7 +269,7 @@ def managed(name, ppa=None, **kwargs):
ret['result'] = False
ret['comment'] = 'Repo management not implemented on this platform'
return ret
if 'key_url' in kwargs and ('keyid' in kwargs or 'keyserver' in kwargs):
ret['result'] = False
ret['comment'] = 'You may not use both "keyid"/"keyserver" and ' \
@ -480,7 +483,7 @@ def absent(name, **kwargs):
'changes': {},
'result': None,
'comment': ''}
repo = {}
if 'ppa' in kwargs and __grains__['os'] in ('Ubuntu', 'Mint'):
name = kwargs.pop('ppa')
if not name.startswith('ppa:'):