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

Merge pull request #12055 from UtahDave/develop

Browse Source 
pylint fixes.
This commit is contained in:
Pedro Algarvio 2014-04-17 00:19:05 +01:00
commit e31abb8390
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/modules/chef.py
View File

@ -6,7 +6,7 @@ Execute chef in server or solo mode
import logging
log = logging.getLogger(__name__)
log = logging.getLogger(__name__)
CHEF_BINARIES = (
'chef-client',
@ -83,11 +83,11 @@ def ohai(*args, **kwargs):
return __exec_cmd(*args, **kwargs)
def __exec_cmd(*args, **kwargs):
def __exec_cmd(*args, **kwargs):
cmd = ''.join([arg for arg in args])
cmd_args = ''.join([
' --{0} {1}'.format(k, v) for k, v in kwargs.items() if not k.startswith('__')]
)
cmd_exec = "{0} {1}".format(cmd, cmd_args)
log.debug("ChefCommand: %s" % cmd_exec)
log.debug("ChefCommand: %s", cmd_exec)
return __salt__['cmd.run'](cmd_exec)