commit 7fb0fe98b50c75f269728ca61126f2dbc6eabc46
author Leonel Gonzalez <lgonzalez@us.ibm.com> Thu Mar 09 15:27:36 2017 -0600
committer Patrick Williams <patrick@stwcx.xyz> Mon Mar 20 12:05:02 2017 -0500
tree 523724b21950f962841b7f0a706862cadc8d01f9
parent 981f2661defa193aa1a27cfe078d8f12002ca3c2

Move object_mapper per dbus path conventions.

Partial fix for openbmc/openbmc#1112.

Change-Id: I964620e7b741dffbf5a680ae775f371a28143860
Signed-off-by: Leonel Gonzalez <lgonzalez@us.ibm.com>

configure.ac

diff --git a/configure.ac b/configure.ac
index 2ad9855..bd80240 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,7 @@
 # Add defines to config header
 AC_DEFINE([MAPPER_BUSNAME], ["xyz.openbmc_project.ObjectMapper"], [Object mapper bus name])
 AC_DEFINE([MAPPER_INTERFACE], ["xyz.openbmc_project.ObjectMapper"], [Object mapper interface])
-AC_DEFINE([MAPPER_PATH], ["/xyz/openbmc_project/ObjectMapper"], [Object mapper DBUS path])
+AC_DEFINE([MAPPER_PATH], ["/xyz/openbmc_project/object_mapper"], [Object mapper DBUS path])
 
 # Workaround for unpatched systemd installs
 AC_ARG_ENABLE([unpatched-systemd],

obmc/mapper/bindings.py

diff --git a/obmc/mapper/bindings.py b/obmc/mapper/bindings.py
index 8adab63..2e2df0a 100644
--- a/obmc/mapper/bindings.py
+++ b/obmc/mapper/bindings.py
@@ -22,7 +22,7 @@
 
 MAPPER_NAME = 'xyz.openbmc_project.ObjectMapper'
 MAPPER_IFACE = MAPPER_NAME
-MAPPER_PATH = '/xyz/openbmc_project/ObjectMapper'
+MAPPER_PATH = '/xyz/openbmc_project/object_mapper'
 MAPPER_NOT_FOUND = 'org.freedesktop.DBus.Error.FileNotFound'