From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Wed, 19 Dec 2018 00:19:02 +0000 (-0800)
Subject: Fix prepend to environ path
X-Git-Tag: v5~10^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F321%2Fhead;p=thirdparty%2Fmkosi.git

Fix prepend to environ path

We need to call this after loading the configuration file, otherwise
anything set there won't work.
---

diff --git a/mkosi b/mkosi
index da31a308c..281747088 100755
--- a/mkosi
+++ b/mkosi
@@ -4434,6 +4434,8 @@ def prepend_to_environ_path(paths: List[str]) -> None:
 def run_verb(args):
     load_args(args)
 
+    prepend_to_environ_path(args.extra_search_paths)
+
     if args.verb in ("build", "clean", "shell", "boot", "qemu"):
         check_root()
         unlink_output(args)
@@ -4466,8 +4468,6 @@ def main() -> None:
     if args.directory is not None:
         os.chdir(args.directory)
 
-    prepend_to_environ_path(args.extra_search_paths)
-
     if args.all:
         for f in os.scandir(args.all_directory):