summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2017-07-29 22:56:48 -0400
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2017-07-29 22:56:48 -0400
commitaeac98bdca848875bc8420999cfd928f08f98013 (patch)
tree4aae5b4a8211f6227fef12e4acce65c1224e5fb9
parent062403dbf1e8ff3f7cbc20501ba4f7de812c0b17 (diff)
downloadphosphor-objmgr-aeac98bdca848875bc8420999cfd928f08f98013.tar.gz
phosphor-objmgr-aeac98bdca848875bc8420999cfd928f08f98013.zip
server: Ignore mapper generated signals
Correct a bug that prevented this. This was always the intent as the mapper does not rely on dbus to inform it of its own signal generating actions. Change-Id: I56af68ed65903ac105a6fb553010c389cf0ea679 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
-rw-r--r--obmc/mapper/server.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/obmc/mapper/server.py b/obmc/mapper/server.py
index cf05866..f5370f0 100644
--- a/obmc/mapper/server.py
+++ b/obmc/mapper/server.py
@@ -499,6 +499,8 @@ class ObjectMapper(dbus.service.Object):
self.bus.list_names())
owners = filter(bool, [get_owner(name) for name in owned_names])
for owned_name, o in owners:
+ if not self.valid_signal(owned_name):
+ continue
self.bus_map[o] = owned_name
self.defer_signals[o] = []
find_dbus_interfaces(
@@ -512,7 +514,7 @@ class ObjectMapper(dbus.service.Object):
if obmc.dbuslib.bindings.is_unique(name):
name = self.bus_map.get(name)
- return name is not None and name is not obmc.mapper.MAPPER_NAME
+ return name is not None and name != obmc.mapper.MAPPER_NAME
def get_signal_interfaces(self, owner, interfaces):
filtered = []
OpenPOWER on IntegriCloud