diff options
| author | jupierce <jupierce@redhat.com> | 2017-03-02 14:40:33 -0500 |
|---|---|---|
| committer | jupierce <jupierce@redhat.com> | 2017-03-02 14:40:33 -0500 |
| commit | 884e071e29223f6a2c883f992e9e8855b6900a8f (patch) | |
| tree | 082c7399d5ed02526c63325d6790ce061ce43c8e | |
| parent | 1604d8a739bd978cc7bacabae22f2a2c0860ec98 (diff) | |
| download | openshift-884e071e29223f6a2c883f992e9e8855b6900a8f.tar.gz openshift-884e071e29223f6a2c883f992e9e8855b6900a8f.tar.bz2 openshift-884e071e29223f6a2c883f992e9e8855b6900a8f.tar.xz openshift-884e071e29223f6a2c883f992e9e8855b6900a8f.zip | |
Fixing checkout for bindings with -binding suffix
4 files changed, 4 insertions, 4 deletions
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 |