diff options
| author |   Pim van Pelt <pim@ipng.nl> | 2022-12-12 00:00:16 +0000 |
|---|---|---|
| committer | Pim van Pelt <pim@ipng.nl> | 2022-12-12 00:00:49 +0000 |
| commit | 1588222e72d19cc769ad0fa9b60349819e2e328f (patch) | |
| tree | b4bf35246aef84b633d25caf85a64ced3e8c4e9b /src/vpp-api/python/vpp_papi | |
| parent | 74ceb38a193e9050038c9db9138b3559ab31767d (diff) | |
papi: fix VPP_API_DIR
Docstring in VPP Python API says that find_api_dir() will search for
environment variable VPP_API_DIR first and foremost, except it doesn't.
Prepend VPP_API_DIR if it exists, and allow dirs to be omitted in case
it will be the empty list []
Type: fix
Signed-off-by: pim@ipng.nl
Change-Id: Ic892e4bb7d8ff50f18e64ddfd2a61343883f07ea
Diffstat (limited to 'src/vpp-api/python/vpp_papi')
| -rw-r--r-- | src/vpp-api/python/vpp_papi/vpp_papi.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/vpp-api/python/vpp_papi/vpp_papi.py b/src/vpp-api/python/vpp_papi/vpp_papi.py index e67ee192f99..a9edfed81be 100644 --- a/src/vpp-api/python/vpp_papi/vpp_papi.py +++ b/src/vpp-api/python/vpp_papi/vpp_papi.py @@ -154,7 +154,7 @@ class VPPValueError(ValueError): class VPPApiJSONFiles: @classmethod - def find_api_dir(cls, dirs): + def find_api_dir(cls, dirs=[]): """Attempt to find the best directory in which API definition files may reside. If the value VPP_API_DIR exists in the environment then it is first on the search list. If we're inside a recognized @@ -170,6 +170,9 @@ class VPPApiJSONFiles: # in which case, plot a course to likely places in the src tree import __main__ as main + if os.getenv("VPP_API_DIR"): + dirs.append(os.getenv("VPP_API_DIR")) + if hasattr(main, "__file__"): # get the path of the calling script localdir = os.path.dirname(os.path.realpath(main.__file__)) |