summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2017-09-11 16:12:07 -0400
committerPatrick Williams <patrick@stwcx.xyz>2017-09-13 21:34:59 +0000
commit94c92a9a36b6fdd5a5cbf6ef0d583cc488f4318a (patch)
tree5c98479ea0284dfe2c48b4fc0e7068775f8789ad
parent8f3017340d32ba0cb89a4370aede58ff8e60dbce (diff)
downloadphosphor-objmgr-94c92a9a36b6fdd5a5cbf6ef0d583cc488f4318a.tar.gz
phosphor-objmgr-94c92a9a36b6fdd5a5cbf6ef0d583cc488f4318a.zip
Fix interface filter logic bug on GetSubTreePaths
This doesn't appear to have ever worked or only in very select situations. When enumerating paths with a filter, handle path- only elements with no interface data. Resolves: openbmc/openbmc#2226 Change-Id: I50a8394c35d5f00f715b153bf6d0bb0b6f153bcf Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
-rw-r--r--obmc/mapper/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/obmc/mapper/server.py b/obmc/mapper/server.py
index e09bbbf..86539a9 100644
--- a/obmc/mapper/server.py
+++ b/obmc/mapper/server.py
@@ -583,7 +583,7 @@ class ObjectMapper(dbus.service.Object):
x[1],
ifaces))
- return dict(filter(lambda x: x[1], map(obj_map, iter(item))))
+ return dict(filter(lambda x: x[1], map(obj_map, iter(item or []))))
@dbus.service.method(obmc.mapper.MAPPER_IFACE, 'sas', 'a{sas}')
def GetObject(self, path, interfaces):
OpenPOWER on IntegriCloud