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
This commit is contained in:
parent
bb1828954b
commit
18464e47f1
@ -19,12 +19,21 @@
|
|||||||
#
|
#
|
||||||
"""Returns data about containers and groups in tabular formats."""
|
"""Returns data about containers and groups in tabular formats."""
|
||||||
|
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
# NOTE(nrb/palendae): The contents of this file were moved
|
# NOTE(nrb/palendae): The contents of this file were moved
|
||||||
# to manage.py in order to facilitate importing of the python code
|
# to manage.py in order to facilitate importing of the python code
|
||||||
|
|
||||||
# This file remains for backwards compatibility
|
# 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__":
|
if __name__ == "__main__":
|
||||||
manage.main()
|
manage.main()
|
||||||
|
Loading…
Reference in New Issue
Block a user