From 18464e47f156d6947c21b9b27069d886feefd799 Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Thu, 17 Aug 2017 10:16:36 -0700 Subject: [PATCH] Fix import of osa_toolkit in inventory-manage.py Add the location of the osa_tookit directory to Python's library paths to allow its modules to be imported. Closes-Bug: 1711223 Change-Id: I70b0ce6e6415499617c0c83b1232813df07772cf --- scripts/inventory-manage.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/inventory-manage.py b/scripts/inventory-manage.py index be70a25f2e..25a713ad1c 100755 --- a/scripts/inventory-manage.py +++ b/scripts/inventory-manage.py @@ -19,12 +19,21 @@ # """Returns data about containers and groups in tabular formats.""" +import os +import sys + # NOTE(nrb/palendae): The contents of this file were moved # to manage.py in order to facilitate importing of the python code # This file remains for backwards compatibility -from osa_toolkit import manage +try: + from osa_toolkit import manage +except ImportError: + current_path = os.path.abspath(os.path.dirname(os.path.realpath(__file__))) + lib_path = os.path.join(current_path, '..') + sys.path.append(lib_path) + from osa_toolkit import manage if __name__ == "__main__": manage.main()