From 1c07eacdce8c29ee55712372496f06b0697acd16 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 16 Dec 2023 20:58:58 +0100 Subject: [PATCH] clan_cli: remove incorrect clan_flake check --- pkgs/clan-cli/clan_cli/__init__.py | 6 +----- pkgs/clan-cli/clan_cli/dirs.py | 4 ---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/__init__.py b/pkgs/clan-cli/clan_cli/__init__.py index 3aea8bc9f..20e834616 100644 --- a/pkgs/clan-cli/clan_cli/__init__.py +++ b/pkgs/clan-cli/clan_cli/__init__.py @@ -8,7 +8,7 @@ from typing import Any from . import backups, config, flakes, history, machines, secrets, vms from .custom_logger import setup_logging -from .dirs import get_clan_flake_toplevel, is_clan_flake +from .dirs import get_clan_flake_toplevel from .ssh import cli as ssh_cli log = logging.getLogger(__name__) @@ -66,10 +66,6 @@ def create_parser(prog: str | None = None) -> argparse.ArgumentParser: raise argparse.ArgumentTypeError( f"flake directory {flake_dir} is not a directory" ) - if not is_clan_flake(flake_dir): - raise argparse.ArgumentTypeError( - f"flake directory {flake_dir} is not a clan flake" - ) return flake_dir parser.add_argument( diff --git a/pkgs/clan-cli/clan_cli/dirs.py b/pkgs/clan-cli/clan_cli/dirs.py index fdf6fe6c3..98076db3a 100644 --- a/pkgs/clan-cli/clan_cli/dirs.py +++ b/pkgs/clan-cli/clan_cli/dirs.py @@ -10,10 +10,6 @@ def get_clan_flake_toplevel() -> Path | None: return find_toplevel([".clan-flake", ".git", ".hg", ".svn", "flake.nix"]) -def is_clan_flake(path: Path) -> bool: - return (path / ".clan-flake").exists() - - def find_git_repo_root() -> Path | None: return find_toplevel([".git"])