From 686d6d4a232cf6822af042b0a959957b89297fc6 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 21 Sep 2013 10:37:09 +0100 Subject: [PATCH 1/3] Fix anomalous backslash. --- salt/modules/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/modules/git.py b/salt/modules/git.py index fd55182552..16b64d6ead 100644 --- a/salt/modules/git.py +++ b/salt/modules/git.py @@ -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) From 2a7c60653d81162fa2d4d182beb5c9ad7101b9df Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 21 Sep 2013 10:38:43 +0100 Subject: [PATCH 2/3] Add missing `**connection_args` --- salt/modules/keystone.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/modules/keystone.py b/salt/modules/keystone.py index c5886d7c00..e888480579 100644 --- a/salt/modules/keystone.py +++ b/salt/modules/keystone.py @@ -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) From c3c7a08a40dee56d978bc448f20ea2a7a919ac57 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 21 Sep 2013 10:39:44 +0100 Subject: [PATCH 3/3] Commas not followed by a space. --- salt/states/keystone.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/states/keystone.py b/salt/states/keystone.py index b8bd2f616f..7c1b2ca880 100644 --- a/salt/states/keystone.py +++ b/salt/states/keystone.py @@ -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.