From: Luca Boccassi <luca.boccassi@microsoft.com>
Date: Thu, 4 Nov 2021 12:59:33 +0000 (+0000)
Subject: Fix --base-image and --base-packages combination
X-Git-Tag: v11~9^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=553740a8257d36428ae033d72a44635c26d5140b;p=thirdparty%2Fmkosi.git

Fix --base-image and --base-packages combination

args.base_packages defaults to 'True', so it's never 'None', so this
check was always false. Remove it.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index a478fbcb9..fed8d8dae 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -6312,7 +6312,7 @@ def load_args(args: argparse.Namespace) -> CommandLineArguments:
 
     # If we are building a sysext we don't want to add base packages to the
     # extension image, as they will already be in the base image.
-    if args.base_image is not None and args.base_packages is None:
+    if args.base_image is not None:
         args.base_packages = False
 
     return CommandLineArguments(**vars(args))