[oe-commits] [openembedded-core] 48/55: wic/engine.py: Load paths from PATH environment variable

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch thud
in repository openembedded-core.

commit 319ee1bb146b91f78d7a141def2b1cf92cf88887
Author: William Bourque <wbourque at gmail.com>
AuthorDate: Mon Feb 11 15:00:48 2019 -0500

    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
    
    (From OE-Core rev: a88bcbae850a2e6d182291d3f8e167aabdbe4842)
    
    Signed-off-by: William Bourque <wbourque at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 scripts/lib/wic/engine.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 97f5e84..880e464 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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.