From 45271cbd62867e2011e288472cd86bfab56c5cbd Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 28 Jan 2018 23:56:05 -0500 Subject: server: Add early escapes to simplify logic Add a couple early escapes to the bus_handler method. Tested: Manually verified mapper content is the same after service discovery. Change-Id: I9c0e08022176345797fd74809770ddfdfeffe904 Signed-off-by: Brad Bishop --- obmc/mapper/server.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/obmc/mapper/server.py b/obmc/mapper/server.py index e1f3af2..11e93ed 100644 --- a/obmc/mapper/server.py +++ b/obmc/mapper/server.py @@ -394,13 +394,13 @@ class ObjectMapper(dbus.service.Object): path, owner, old=old, new=[]) def bus_handler(self, owned_name, old, new): - valid = False - if not obmc.dbuslib.bindings.is_unique(owned_name): - valid = self.bus_normalize(owned_name) + if obmc.dbuslib.bindings.is_unique(owned_name) or \ + owned_name == obmc.mapper.MAPPER_NAME: + return - if valid and new: + if new: self.process_new_owner(owned_name, new) - if valid and old: + if old: # discard any unhandled signals # or in progress discovery if old in self.defer_signals: -- cgit v1.2.3