aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-15 07:57:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-15 08:17:38 +0000
commitaf3803e5189d7814f9dbd238fb6dab200f351e1a (patch)
treebac9f6495b54a95d8acea5c123c31de7918d1b24 /scripts
parent8190d192fceb9b0969385507d3d4bca7be75c810 (diff)
downloadopenembedded-core-contrib-af3803e5189d7814f9dbd238fb6dab200f351e1a.tar.gz
openembedded-core-contrib-af3803e5189d7814f9dbd238fb6dab200f351e1a.tar.bz2
openembedded-core-contrib-af3803e5189d7814f9dbd238fb6dab200f351e1a.zip
wic/engine: Fix missing parted autobuilder failures
OE-Core rev: a88bcbae850a2e6d182291d3f8e167aabdbe4842 broke the ability to find parted as it may be in sbin which is not in PATH for some users on some distros. Iterate on the original patch to fix this and also fix the original problem. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/engine.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 880e4640367..ea600d2854e 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -244,15 +244,17 @@ class Disk:
self._psector_size = None
self._ptable_format = None
+ # find parted
# read paths from $PATH environment variable
# if it fails, use hardcoded paths
+ pathlist = "/bin:/usr/bin:/usr/sbin:/sbin/"
try:
- self.paths = os.environ['PATH']
+ self.paths = os.environ['PATH'] + ":" + pathlist
except KeyError:
- self.paths = "/bin:/usr/bin:/usr/sbin:/sbin/"
+ self.paths = pathlist
if native_sysroot:
- for path in self.paths.split(':'):
+ for path in pathlist.split(':'):
self.paths = "%s%s:%s" % (native_sysroot, path, self.paths)
self.parted = find_executable("parted", self.paths)