From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 30 Apr 2023 19:15:27 +0000 (+0200)
Subject: Allow specifying empty --directory to not parse any config files
X-Git-Tag: v15~188^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b48e661fef2d5fb55f55c1f8d53c27213375827;p=thirdparty%2Fmkosi.git

Allow specifying empty --directory to not parse any config files
---

diff --git a/mkosi/config.py b/mkosi/config.py
index cf249d01c..2eef4e870 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -1171,7 +1171,6 @@ class MkosiConfigParser:
         parser.add_argument(
             "-C", "--directory",
             help="Change to specified directory before doing anything",
-            type=Path,
             metavar="PATH",
             default=None,
         )
@@ -1695,13 +1694,14 @@ class MkosiConfigParser:
         if args.verb == Verb.help:
             PagerHelpAction.__call__(None, argparser, namespace)  # type: ignore
 
-        if args.directory and not args.directory.is_dir():
+        if args.directory and not Path(args.directory).is_dir():
             die(f"{args.directory} is not a directory!")
 
         if args.directory:
             os.chdir(args.directory)
 
-        self.parse_config(Path("."), namespace)
+        if args.directory != "":
+            self.parse_config(Path("."), namespace)
 
         for s in self.SETTINGS:
             if s.dest in namespace:
@@ -1820,7 +1820,7 @@ def load_credentials(args: argparse.Namespace) -> dict[str, str]:
     creds = {}
 
     d = Path("mkosi.credentials")
-    if d.is_dir():
+    if args.directory != "" and d.is_dir():
         for e in d.iterdir():
             if os.access(e, os.X_OK):
                 creds[e.name] = run([e], text=True, stdout=subprocess.PIPE, env=os.environ).stdout