diff options
| -rw-r--r-- | changes/feature_improve_which | 2 | ||||
| -rw-r--r-- | src/leap/common/files.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/changes/feature_improve_which b/changes/feature_improve_which new file mode 100644 index 0000000..d1d1fb5 --- /dev/null +++ b/changes/feature_improve_which @@ -0,0 +1,2 @@ + o Prioritize the path_extension in the which method so it finds our bundled + app before the system one, if any. diff --git a/src/leap/common/files.py b/src/leap/common/files.py index a28f548..4c443dd 100644 --- a/src/leap/common/files.py +++ b/src/leap/common/files.py @@ -111,7 +111,7 @@ def which(name, flags=os.X_OK, path_extension="/usr/sbin:/sbin"): result = [] exts = filter(None, os.environ.get('PATHEXT', '').split(os.pathsep)) path = os.environ.get('PATH', None) - path += ":" + path_extension + path = path_extension + os.pathsep + path if path is None: return [] parts = path.split(os.pathsep) |