We never need to leave the directory specified with --directory, so
let's not leave it.
import contextlib
import logging
-import os
import subprocess
import sys
from collections.abc import Iterator
from mkosi import run_verb
from mkosi.config import MkosiConfigParser
-from mkosi.log import ARG_DEBUG, die, log_setup
+from mkosi.log import ARG_DEBUG, log_setup
from mkosi.run import excepthook
if ARG_DEBUG.get():
logging.getLogger().setLevel(logging.DEBUG)
- if args.directory:
- if args.directory.is_dir():
- os.chdir(args.directory)
- else:
- die(f"Error: {args.directory} is not a directory!")
-
run_verb(args, config)
PagerHelpAction.__call__(None, argparser, namespace) # type: ignore
if args.directory and not args.directory.is_dir():
- die(f"Error: {namespace.directory} is not a directory!")
+ die(f"{args.directory} is not a directory!")
- with chdir(args.directory or Path.cwd()):
- self.parse_config(Path("."), namespace)
+ if args.directory:
+ os.chdir(args.directory)
+
+ self.parse_config(Path("."), namespace)
for s in self.SETTINGS:
if s.dest in namespace: