From cea706c4b6eab684c38b8dd9a2091ba5d565e0b6 Mon Sep 17 00:00:00 2001 From: Evgenii Alekseev Date: Wed, 30 Jul 2025 16:59:35 +0300 Subject: [PATCH] use generic packages tree for all repos --- src/ahriman/application/handlers/tree_migrate.py | 1 - src/ahriman/models/.repository_paths.py.kate-swp | Bin 124 -> 0 bytes src/ahriman/models/repository_paths.py | 2 +- .../handlers/test_handler_tree_migrate.py | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 src/ahriman/models/.repository_paths.py.kate-swp diff --git a/src/ahriman/application/handlers/tree_migrate.py b/src/ahriman/application/handlers/tree_migrate.py index 7edc7e42..1f033207 100644 --- a/src/ahriman/application/handlers/tree_migrate.py +++ b/src/ahriman/application/handlers/tree_migrate.py @@ -95,7 +95,6 @@ class TreeMigrate(Handler): """ # we don't care about devtools chroot for attribute in ( - RepositoryPaths.archive, RepositoryPaths.packages, RepositoryPaths.pacman, RepositoryPaths.repository, diff --git a/src/ahriman/models/.repository_paths.py.kate-swp b/src/ahriman/models/.repository_paths.py.kate-swp deleted file mode 100644 index 30f689fbee328d9802ee061606f2fd3a58e0d1f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 124 zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?VniP>QyWz8~YPRvIJ$)CIID(^@t^agt} jFfa--KmcQ|E1b{Bz`($0=o%aZl?U;ea7%*>U~&ZjOjHxB diff --git a/src/ahriman/models/repository_paths.py b/src/ahriman/models/repository_paths.py index 5cb8341a..0562c6ad 100644 --- a/src/ahriman/models/repository_paths.py +++ b/src/ahriman/models/repository_paths.py @@ -93,7 +93,7 @@ class RepositoryPaths(LazyLogging): Returns: Path: archive directory root """ - return self.root / "archive" / self._suffix + return self.root / "archive" @property def build_root(self) -> Path: diff --git a/tests/ahriman/application/handlers/test_handler_tree_migrate.py b/tests/ahriman/application/handlers/test_handler_tree_migrate.py index 3f161f8e..1c223ed6 100644 --- a/tests/ahriman/application/handlers/test_handler_tree_migrate.py +++ b/tests/ahriman/application/handlers/test_handler_tree_migrate.py @@ -69,7 +69,6 @@ def test_move_tree(mocker: MockerFixture) -> None: TreeMigrate.tree_move(from_paths, to_paths) rename_mock.assert_has_calls([ - MockCall(from_paths.archive, to_paths.archive), MockCall(from_paths.packages, to_paths.packages), MockCall(from_paths.pacman, to_paths.pacman), MockCall(from_paths.repository, to_paths.repository),