From e3e43601d23466a4549bb705794d2407c5ace8ba Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Wed, 28 Aug 2019 13:32:35 +0200 Subject: [PATCH] Correct the relative path calculation I'm not sure what I was thinking, but the code is clearly wrong now. Change-Id: Icf17b8e9181dbb387fd65ae141d43749309fd0b4 --- ironic_python_agent_builder/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ironic_python_agent_builder/__init__.py b/ironic_python_agent_builder/__init__.py index 60322e2..6ec6d8a 100644 --- a/ironic_python_agent_builder/__init__.py +++ b/ironic_python_agent_builder/__init__.py @@ -18,8 +18,12 @@ import sys LOCATIONS = [ os.path.abspath('.'), - # This accounts for pip installations on Ubuntu that go into /usr/local - os.path.abspath(os.path.basename(sys.argv[0])), + # This accounts for pip installations on Ubuntu that go into /usr/local. + # This logic converts e.g. /usr/local/bin/ironic-python-agent-builder + # into /usr/local/share/ironic-python-agent-builder. + os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), + '..', 'share', + 'ironic-python-agent-builder')), # This accounts for system-wide installations to /usr os.path.join(sys.prefix, 'share', 'ironic-python-agent-builder'), ]