From 80ead1bf4d0a3950f0f1e4f38c354c08eb1cad71 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Tue, 10 Jun 2025 17:43:03 +0200 Subject: [PATCH] Refactor(clanInternals): remove depending on clanInternals.inventory --- pkgs/clan-cli/clan_lib/flake/flake_test.py | 4 ++-- pkgs/clan-cli/clan_lib/machines/machines.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/clan-cli/clan_lib/flake/flake_test.py b/pkgs/clan-cli/clan_lib/flake/flake_test.py index b3437d1f7..e06fde84b 100644 --- a/pkgs/clan-cli/clan_lib/flake/flake_test.py +++ b/pkgs/clan-cli/clan_lib/flake/flake_test.py @@ -358,9 +358,9 @@ def test_caching_works(flake: ClanFlake) -> None: my_flake, "get_from_nix", wraps=my_flake.get_from_nix ) as tracked_build: assert tracked_build.call_count == 0 - my_flake.select("clanInternals.inventory.meta") + my_flake.select("clanInternals.inventoryClass.inventory.meta") assert tracked_build.call_count == 1 - my_flake.select("clanInternals.inventory.meta") + my_flake.select("clanInternals.inventoryClass.inventory.meta") assert tracked_build.call_count == 1 diff --git a/pkgs/clan-cli/clan_lib/machines/machines.py b/pkgs/clan-cli/clan_lib/machines/machines.py index f90030610..57a228677 100644 --- a/pkgs/clan-cli/clan_lib/machines/machines.py +++ b/pkgs/clan-cli/clan_lib/machines/machines.py @@ -63,7 +63,7 @@ class Machine: def _class_(self) -> str: try: return self.flake.select( - f'clanInternals.inventory.machines."{self.name}".machineClass' + f'clanInternals.inventoryClass.inventory.machines."{self.name}".machineClass' ) except ClanCmdError as e: if re.search(f"error: attribute '{self.name}' missing", e.cmd.stderr):