From 884e071e29223f6a2c883f992e9e8855b6900a8f Mon Sep 17 00:00:00 2001 From: jupierce Date: Thu, 2 Mar 2017 14:40:33 -0500 Subject: Fixing checkout for bindings with -binding suffix --- roles/lib_openshift/library/oc_adm_policy_group.py | 2 +- roles/lib_openshift/library/oc_adm_policy_user.py | 2 +- roles/lib_openshift/src/class/oc_adm_policy_group.py | 2 +- roles/lib_openshift/src/class/oc_adm_policy_user.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'roles') diff --git a/roles/lib_openshift/library/oc_adm_policy_group.py b/roles/lib_openshift/library/oc_adm_policy_group.py index 1a64812b1..3bc5dea0e 100644 --- a/roles/lib_openshift/library/oc_adm_policy_group.py +++ b/roles/lib_openshift/library/oc_adm_policy_group.py @@ -1948,7 +1948,7 @@ class PolicyGroup(OpenShiftCLI): return False - elif '\"%s\" not found' % self.config.config_options['name']['value'] in results['stderr']: + elif self.config.config_options['name']['value'] in results['stderr'] and '" not found' in results['stderr']: return False return results diff --git a/roles/lib_openshift/library/oc_adm_policy_user.py b/roles/lib_openshift/library/oc_adm_policy_user.py index f0f80f25f..1ac9bf54d 100644 --- a/roles/lib_openshift/library/oc_adm_policy_user.py +++ b/roles/lib_openshift/library/oc_adm_policy_user.py @@ -1947,7 +1947,7 @@ class PolicyUser(OpenShiftCLI): return False - elif '\"%s\" not found' % self.config.config_options['name']['value'] in results['stderr']: + elif self.config.config_options['name']['value'] in results['stderr'] and '" not found' in results['stderr']: return False return results diff --git a/roles/lib_openshift/src/class/oc_adm_policy_group.py b/roles/lib_openshift/src/class/oc_adm_policy_group.py index 1d6b2450a..afb066c77 100644 --- a/roles/lib_openshift/src/class/oc_adm_policy_group.py +++ b/roles/lib_openshift/src/class/oc_adm_policy_group.py @@ -89,7 +89,7 @@ class PolicyGroup(OpenShiftCLI): return False - elif '\"%s\" not found' % self.config.config_options['name']['value'] in results['stderr']: + elif self.config.config_options['name']['value'] in results['stderr'] and '" not found' in results['stderr']: return False return results diff --git a/roles/lib_openshift/src/class/oc_adm_policy_user.py b/roles/lib_openshift/src/class/oc_adm_policy_user.py index 8d2c5eadf..c9d53acfa 100644 --- a/roles/lib_openshift/src/class/oc_adm_policy_user.py +++ b/roles/lib_openshift/src/class/oc_adm_policy_user.py @@ -88,7 +88,7 @@ class PolicyUser(OpenShiftCLI): return False - elif '\"%s\" not found' % self.config.config_options['name']['value'] in results['stderr']: + elif self.config.config_options['name']['value'] in results['stderr'] and '" not found' in results['stderr']: return False return results -- cgit v1.2.1