summaryrefslogtreecommitdiff
path: root/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py
diff options
context:
space:
mode:
authorEd Tanous <ed.tanous@intel.com>2019-06-07 06:59:15 +0300
committerGitHub <noreply@github.com>2019-06-07 06:59:15 +0300
commit5575b1d27fc222f973d96dc06af0f21ba7656f28 (patch)
tree6d29c0a7edc3769c9fbba0a3c6f6ed9ba10ba8ed /meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py
parent4aa406adc1accd959bf64d299d750e8b2083ace3 (diff)
parent10bc2ef852277cf8e9858f75cea9f55b482bf85b (diff)
downloadopenbmc-5575b1d27fc222f973d96dc06af0f21ba7656f28.tar.xz
Merge pull request #10 from Intel-BMC/update
Update
Diffstat (limited to 'meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py')
-rwxr-xr-xmeta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py
index 877e3eb57..5e6c4b5e6 100755
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py
@@ -12,11 +12,6 @@ import sys
import yaml
import copy
-# Custom representer for None types. This is to handle empty dictionaries.
-# By default Pyyaml outputs these as "null", whereas we want an empty character.
-def represent_none(self, _):
- return self.represent_scalar('tag:yaml.org,2002:null', '')
-
def dict_merge(target, source):
"""Deep merge for dicts.
@@ -48,8 +43,6 @@ if len(sys.argv) == 2:
# No overrides to handle
sys.exit(0)
-yaml.add_representer(type(None), represent_none)
-
target_filename = sys.argv[1]
with open(target_filename) as target_file:
data = yaml.safe_load(target_file)