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 blatant bug in salt.utils.option

Browse Source
This commit is contained in:
Thomas S Hatch 2013-03-28 12:55:46 -06:00
parent 8339af546d
commit 9671aca219
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/utils/__init__.py
View File

@ -909,11 +909,15 @@ def rm_rf(path):
def option( def option(
value, value,
default='', default='',
opts, opts=None,
pillar): pillar=None):
''' '''
Pass in a generic option and receive the value that will be assigned Pass in a generic option and receive the value that will be assigned
''' '''
if opts is None:
opts = {}
if pillar is None:
pillar = {}
if value in opts: if value in opts:
return opts[value] return opts[value]
if value in pillar.get('master', {}): if value in pillar.get('master', {}):