From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 10 Sep 2024 12:39:50 +0000 (+0200)
Subject: Only append distro~release~arch suffix to build dir if not already there
X-Git-Tag: v25~308^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d078b7ae2232a6d49fd779e6bd27ae32d459275;p=thirdparty%2Fmkosi.git

Only append distro~release~arch suffix to build dir if not already there
---

diff --git a/mkosi/config.py b/mkosi/config.py
index bd890f44c..fb5db0144 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -4050,7 +4050,7 @@ def load_config(config: argparse.Namespace) -> Config:
     # Make sure we don't modify the input namespace.
     config = copy.deepcopy(config)
 
-    if config.build_dir:
+    if config.build_dir and config.build_dir.name != f"{config.distribution}~{config.release}~{config.architecture}":
         config.build_dir /= f"{config.distribution}~{config.release}~{config.architecture}"
 
     if config.sign: