summaryrefslogtreecommitdiffstats
path: root/roles/lib_openshift/library/oc_secret.py
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-22 00:12:48 -0700
committerGitHub <noreply@github.com>2017-09-22 00:12:48 -0700
commit2d0501b63ff07b177b3fb5b1c6663ed369656240 (patch)
tree8b20ce9533782f0c3137ff46c56c34c7417ab71d /roles/lib_openshift/library/oc_secret.py
parent8c4380f5f6613abcc4c9b7916914ad88bde9c1d1 (diff)
parent7a59228342378bdfe5c9a6404a262569212d6279 (diff)
downloadopenshift-2d0501b63ff07b177b3fb5b1c6663ed369656240.tar.gz
openshift-2d0501b63ff07b177b3fb5b1c6663ed369656240.tar.bz2
openshift-2d0501b63ff07b177b3fb5b1c6663ed369656240.tar.xz
openshift-2d0501b63ff07b177b3fb5b1c6663ed369656240.zip
Merge pull request #5476 from kwoodson/yedit_list_fix
Automatic merge from submit-queue Returning actual results of yedit query. Empty list was returning empty dict. This is a simple change but since code generation happens it affects lots of files. The only change that is happening here is the following: ``` - rval = yamlfile.get(params['key']) or {}  + rval = yamlfile.get(params['key']) ``` When something returned as 0, [], or None the query would return {}. This was unintended.
Diffstat (limited to 'roles/lib_openshift/library/oc_secret.py')
-rw-r--r--roles/lib_openshift/library/oc_secret.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/lib_openshift/library/oc_secret.py b/roles/lib_openshift/library/oc_secret.py
index 0c4b99e30..c010607e8 100644
--- a/roles/lib_openshift/library/oc_secret.py
+++ b/roles/lib_openshift/library/oc_secret.py
@@ -765,7 +765,7 @@ class Yedit(object): # pragma: no cover
yamlfile.yaml_dict = content
if params['key']:
- rval = yamlfile.get(params['key']) or {}
+ rval = yamlfile.get(params['key'])
return {'changed': False, 'result': rval, 'state': state}