From 1664c8ee6df323b85272d1c56c9bb42c7380bbf3 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 29 Jun 2016 22:38:55 -0400 Subject: Remove unnecessary InterfacesAdded signals Remove ObjectManager signals emitted before a bus name is owned. This isn't necessary now that the system_manager can detect objects via NameOwnerChanged. Change-Id: Ia2b626a926392b50d20c26474e6c9a9fdb3ca2f0 Signed-off-by: Brad Bishop --- pychassisctl/chassis_control.py | 1 - pyfanctl/fan_control.py | 1 - pyflashbmc/bmc_update.py | 2 -- pyinventorymgr/inventory_items.py | 1 - pysensormgr/sensor_manager2.py | 1 - pysystemmgr/system_manager.py | 1 - 6 files changed, 7 deletions(-) diff --git a/pychassisctl/chassis_control.py b/pychassisctl/chassis_control.py index 8a95ba6..fc18703 100755 --- a/pychassisctl/chassis_control.py +++ b/pychassisctl/chassis_control.py @@ -101,7 +101,6 @@ class ChassisControlObject(DbusProperties, DbusObjectManager): bus.add_signal_receiver(self.SystemStateHandler, signal_name="GotoSystemState") - self.InterfacesAdded(name, self.properties) def getInterface(self, name): diff --git a/pyfanctl/fan_control.py b/pyfanctl/fan_control.py index e5ea714..e1eac7d 100644 --- a/pyfanctl/fan_control.py +++ b/pyfanctl/fan_control.py @@ -36,7 +36,6 @@ class FanControl(DbusProperties,DbusObjectManager): print "Initializing fan: "+fan obj = bus.get_object(FAN_BUS,fan,introspect=False) self.fan_intf.append(dbus.Interface(obj,FAN_IFACE)) - self.InterfacesAdded(name,self.properties) @dbus.service.method(DBUS_NAME, in_signature='', out_signature='') diff --git a/pyflashbmc/bmc_update.py b/pyflashbmc/bmc_update.py index 1e6fbe4..147f0c3 100644 --- a/pyflashbmc/bmc_update.py +++ b/pyflashbmc/bmc_update.py @@ -48,8 +48,6 @@ class BmcFlashControl(DbusProperties,DbusObjectManager): self.update_process = None self.progress_name = None - self.InterfacesAdded(name,self.properties) - @dbus.service.method(DBUS_NAME, in_signature='ss', out_signature='') diff --git a/pyinventorymgr/inventory_items.py b/pyinventorymgr/inventory_items.py index 5422a39..8261589 100644 --- a/pyinventorymgr/inventory_items.py +++ b/pyinventorymgr/inventory_items.py @@ -21,7 +21,6 @@ class Inventory(DbusProperties,DbusObjectManager): DbusProperties.__init__(self) DbusObjectManager.__init__(self) dbus.service.Object.__init__(self,bus,name) - self.InterfacesAdded(name,self.properties) class InventoryItem(DbusProperties): diff --git a/pysensormgr/sensor_manager2.py b/pysensormgr/sensor_manager2.py index a9971fc..45c1b92 100644 --- a/pysensormgr/sensor_manager2.py +++ b/pysensormgr/sensor_manager2.py @@ -19,7 +19,6 @@ class SensorManager(DbusProperties,DbusObjectManager): DbusProperties.__init__(self) DbusObjectManager.__init__(self) dbus.service.Object.__init__(self,bus,name) - self.InterfacesAdded(name,self.properties) @dbus.service.method(DBUS_NAME, in_signature='ss', out_signature='') diff --git a/pysystemmgr/system_manager.py b/pysystemmgr/system_manager.py index a7a22cc..1d35ac9 100644 --- a/pysystemmgr/system_manager.py +++ b/pysystemmgr/system_manager.py @@ -67,7 +67,6 @@ class SystemManager(DbusProperties,DbusObjectManager): if obmc.utils.misc.org_dot_openbmc_match(s): self.bus_handler(s, '', s) - self.InterfacesAdded(obj_name,self.properties) print "SystemManager Init Done" -- cgit v1.2.1