diff options
author | Jason DeTiberus <jdetiber@redhat.com> | 2017-02-18 20:01:53 -0500 |
---|---|---|
committer | Jason DeTiberus <jdetiber@redhat.com> | 2017-02-21 23:39:32 -0500 |
commit | a3603a5187839e25e9d8a51de70fea0b68439839 (patch) | |
tree | c6f9dd5beb19a1d6a7df42ee77a3688e9237e3bc /roles/lib_openshift/src/lib/import.py | |
parent | 4b8328fe94015b25209d9b3e6c94b2a3cd0cff40 (diff) | |
download | openshift-a3603a5187839e25e9d8a51de70fea0b68439839.tar.gz openshift-a3603a5187839e25e9d8a51de70fea0b68439839.tar.bz2 openshift-a3603a5187839e25e9d8a51de70fea0b68439839.tar.xz openshift-a3603a5187839e25e9d8a51de70fea0b68439839.zip |
lib_openshift oc file lookup improvements
- Move binary file search to separate method called from constructor
- Use six.PY3 instaed of sys.version_info
- Combine additional paths with the paths from the environment
- For py3 pass the combined paths to shutil.which
- For py2 explictly search for existance of file from combined paths
instead of using distutils.spawn.find_executable and falling back
- Use 'oc adm' instead of 'oadm'
- Fix generate_validation test issue
- fix tests for oc binary location
- add tests for file lookup
Diffstat (limited to 'roles/lib_openshift/src/lib/import.py')
-rw-r--r-- | roles/lib_openshift/src/lib/import.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/roles/lib_openshift/src/lib/import.py b/roles/lib_openshift/src/lib/import.py index 5b2479b87..a79297898 100644 --- a/roles/lib_openshift/src/lib/import.py +++ b/roles/lib_openshift/src/lib/import.py @@ -10,7 +10,6 @@ import atexit import copy import json import os -import sys import re import shutil import subprocess |