From bc6a09c36e08d0b1893097e2628459bddcb182e3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 15 Feb 2019 07:57:25 +0000 Subject: 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. (From OE-Core rev: af3803e5189d7814f9dbd238fb6dab200f351e1a) (From OE-Core rev: 68f56a4967d3121940669ca9116e759081b0b73b) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- scripts/lib/wic/engine.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index c1270456f5..7e6519ea4c 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) -- cgit v1.2.3-54-g00ecf