]> code.ossystems Code Review - openembedded-core.git/commitdiff
wic/engine.py: Load paths from PATH environment variable
authorWilliam Bourque <wbourque@gmail.com>
Mon, 11 Feb 2019 20:00:48 +0000 (15:00 -0500)
committerArmin Kuster <akuster808@gmail.com>
Sun, 7 Apr 2019 09:39:46 +0000 (15:09 +0530)
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

(From OE-Core rev: a88bcbae850a2e6d182291d3f8e167aabdbe4842)

Signed-off-by: William Bourque <wbourque@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
scripts/lib/wic/engine.py

index 951bf307178be9d3270519f4a4cd671b3ad0d364..c1270456f5e7f7ca6dd592a41fad62b3e8795777 100644 (file)
@@ -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)