From c85a2490db4999c160c77d0b2256d3c885221431 Mon Sep 17 00:00:00 2001 From: Colton Myers Date: Tue, 26 Sep 2017 14:25:06 -0600 Subject: [PATCH] Add a couple of missing upstream changes from hubble --- _beacons/pulsar.py | 2 +- _modules/nova_loader.py | 1 + _modules/win_pulsar.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/_beacons/pulsar.py b/_beacons/pulsar.py index df1c32f..8a22ac0 100644 --- a/_beacons/pulsar.py +++ b/_beacons/pulsar.py @@ -417,7 +417,7 @@ def _dict_update(dest, upd, recursive_update=True, merge_lists=False): dest_subkey = None if isinstance(dest_subkey, collections.Mapping) \ and isinstance(val, collections.Mapping): - ret = update(dest_subkey, val, merge_lists=merge_lists) + ret = _dict_update(dest_subkey, val, merge_lists=merge_lists) dest[key] = ret elif isinstance(dest_subkey, list) \ and isinstance(val, list): diff --git a/_modules/nova_loader.py b/_modules/nova_loader.py index b43559e..e28603b 100644 --- a/_modules/nova_loader.py +++ b/_modules/nova_loader.py @@ -1911,6 +1911,7 @@ def _load_module(self, name): data = yaml.safe_load(fh_) except Exception as exc: self.__missing_data__[name] = str(exc) + log.exception('Error loading yaml {0}'.format(fh_)) return False self.__data__[name] = data diff --git a/_modules/win_pulsar.py b/_modules/win_pulsar.py index bfd272f..001489e 100644 --- a/_modules/win_pulsar.py +++ b/_modules/win_pulsar.py @@ -547,7 +547,7 @@ def _dict_update(dest, upd, recursive_update=True, merge_lists=False): dest_subkey = None if isinstance(dest_subkey, collections.Mapping) \ and isinstance(val, collections.Mapping): - ret = update(dest_subkey, val, merge_lists=merge_lists) + ret = _dict_update(dest_subkey, val, merge_lists=merge_lists) dest[key] = ret elif isinstance(dest_subkey, list) \ and isinstance(val, list):