From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 20 Nov 2019 09:10:21 +0000 (+0100)
Subject: mkosi: having a "defaults" file is optional, hence conditionalize MKOSI_DEFAULT
X-Git-Tag: v6~99^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F386%2Fhead;p=thirdparty%2Fmkosi.git

mkosi: having a "defaults" file is optional, hence conditionalize MKOSI_DEFAULT

Follow-up for b067223c0de3ca814abac0ba6459d4916fd15746
---

diff --git a/mkosi b/mkosi
index 947cddfca..22659095d 100755
--- a/mkosi
+++ b/mkosi
@@ -4436,9 +4436,11 @@ def run_build_script(args: CommandLineArguments, workspace: str, raw: Optional[B
                    "--setenv=WITH_DOCS=" + one_zero(args.with_docs),
                    "--setenv=WITH_TESTS=" + one_zero(args.with_tests),
                    "--setenv=WITH_NETWORK=" + one_zero(args.with_network),
-                   "--setenv=MKOSI_DEFAULT=" + args.default_path,
                    "--setenv=DESTDIR=/root/dest"]
 
+        if args.default_path is not None:
+            cmdline.append("--setenv=MKOSI_DEFAULT=" + args.default_path)
+
         if args.build_sources is not None:
             cmdline.append("--setenv=SRCDIR=/root/src")
             cmdline.append("--chdir=/root/src")