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

Merge pull request #7389 from s0undt3ch/hotfix/lint

Browse Source 
Some lint fixes
This commit is contained in:
Joseph Hall 2013-09-21 06:37:53 -07:00
commit 568b3007f0
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/git.py
View File

@ -115,7 +115,7 @@ def current_branch(cwd, user=None):
'''
Returns the current branch name, if on a branch.
'''
cmd = 'git branch --list | grep "^*\ " | cut -d " " -f 2 | ' + \
cmd = r'git branch --list | grep "^*\ " | cut -d " " -f 2 | ' + \
'grep -v "(detached"'
return __salt__['cmd.run_stdout'](cmd, cwd=cwd, runas=user)

2
salt/modules/keystone.py
View File

@ -677,7 +677,7 @@ def user_create(name, password, email, tenant_id=None,
return user_get(item.id, profile=profile, **connection_args)
def user_delete(user_id=None, name=None, profile=None):
def user_delete(user_id=None, name=None, profile=None, **connection_args):
'''
Delete a user (keystone user-delete)

4
salt/states/keystone.py
View File

@ -191,7 +191,7 @@ def user_present(name,
return ret
def user_absent(name,profile=None,**connection_args):
def user_absent(name, profile=None, **connection_args):
'''
Ensure that the keystone user is absent.
@ -319,7 +319,7 @@ def role_present(name, profile=None, **connection_args):
ret['changes']['Role'] = 'Created'
return ret
def role_absent(name, profile=None, **connection_args):
'''
Ensure that the keystone role is absent.