summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Bourque <wbourque@gmail.com>2019-02-11 15:00:48 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-14 11:20:06 +0000
commita88bcbae850a2e6d182291d3f8e167aabdbe4842 (patch)
tree755ad2b42aae47f2587f2499813cbc0b4c546089
parent39a3d2c603429865af632fe41b2cf32c3dfdfb1d (diff)
downloadopenembedded-core-contrib-a88bcbae850a2e6d182291d3f8e167aabdbe4842.tar.gz
openembedded-core-contrib-a88bcbae850a2e6d182291d3f8e167aabdbe4842.tar.bz2
openembedded-core-contrib-a88bcbae850a2e6d182291d3f8e167aabdbe4842.zip
wic/engine.py: Load paths from PATH environment variable
Load self.paths from environment variable and if it fails, fall back to hardcoded list. This is required for users that would need to load different e2fsprogs binaries if their system's ones are not recent enought Signed-off-by: William Bourque <wbourque@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/wic/engine.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 97f5e848cc..880e464036 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -244,8 +244,13 @@ class Disk:
self._psector_size = None
self._ptable_format = None
- # find parted
- self.paths = "/bin:/usr/bin:/usr/sbin:/sbin/"
+ # read paths from $PATH environment variable
+ # if it fails, use hardcoded paths
+ try:
+ self.paths = os.environ['PATH']
+ except KeyError:
+ self.paths = "/bin:/usr/bin:/usr/sbin:/sbin/"
+
if native_sysroot:
for path in self.paths.split(':'):
self.paths = "%s%s:%s" % (native_sysroot, path, self.paths)