diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-01-28 23:56:05 -0500 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-01-31 13:34:08 -0500 |
| commit | 45271cbd62867e2011e288472cd86bfab56c5cbd (patch) | |
| tree | 4404cc1c08113a614774e9eaf884972445d2ec9b | |
| parent | 787aa8130d57583233bae3011c1417f5607b825b (diff) | |
| download | phosphor-objmgr-45271cbd62867e2011e288472cd86bfab56c5cbd.tar.gz phosphor-objmgr-45271cbd62867e2011e288472cd86bfab56c5cbd.zip | |
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 <bradleyb@fuzziesquirrel.com>
| -rw-r--r-- | obmc/mapper/server.py | 10 |
1 files 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: |
