diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-03-02 15:34:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-02 15:34:34 -0500 |
| commit | 6eeceffad2d296d8e4c9a14de3c8e831e438e24c (patch) | |
| tree | e3976aac739c1d1b33a3773514550a0eea07371c /roles/lib_openshift | |
| parent | 486f35bb371ebce26c59273324193851a6c5740e (diff) | |
| parent | 884e071e29223f6a2c883f992e9e8855b6900a8f (diff) | |
| download | openshift-6eeceffad2d296d8e4c9a14de3c8e831e438e24c.tar.gz openshift-6eeceffad2d296d8e4c9a14de3c8e831e438e24c.tar.bz2 openshift-6eeceffad2d296d8e4c9a14de3c8e831e438e24c.tar.xz openshift-6eeceffad2d296d8e4c9a14de3c8e831e438e24c.zip | |
Merge pull request #3547 from jupierce/oadm_policy_group_patch
Fixing checkout for bindings with -binding suffix
Diffstat (limited to 'roles/lib_openshift')
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 |