From 2cecbb3d53bcc268ea8cae86ba40aed8dc099dae Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Thu, 4 May 2023 14:29:00 +0300 Subject: [PATCH] do not assign path in context manager as it is deprectated --- src/ahriman/core/gitremote/remote_pull.py | 3 ++- src/ahriman/core/gitremote/remote_push.py | 3 ++- src/ahriman/core/repository/executor.py | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ahriman/core/gitremote/remote_pull.py b/src/ahriman/core/gitremote/remote_pull.py index f299f5c3..6674a21a 100644 --- a/src/ahriman/core/gitremote/remote_pull.py +++ b/src/ahriman/core/gitremote/remote_pull.py @@ -61,7 +61,8 @@ class RemotePull(LazyLogging): """ clone repository from remote source """ - with TemporaryDirectory(ignore_cleanup_errors=True) as dir_name, (clone_dir := Path(dir_name)): + with TemporaryDirectory(ignore_cleanup_errors=True) as dir_name: + clone_dir = Path(dir_name) Sources.fetch(clone_dir, self.remote_source) self.repo_copy(clone_dir) diff --git a/src/ahriman/core/gitremote/remote_push.py b/src/ahriman/core/gitremote/remote_push.py index b9c4cc4d..9b17179e 100644 --- a/src/ahriman/core/gitremote/remote_push.py +++ b/src/ahriman/core/gitremote/remote_push.py @@ -115,7 +115,8 @@ class RemotePush(LazyLogging): result(Result): build result """ try: - with TemporaryDirectory(ignore_cleanup_errors=True) as dir_name, (clone_dir := Path(dir_name)): + with TemporaryDirectory(ignore_cleanup_errors=True) as dir_name: + clone_dir = Path(dir_name) Sources.fetch(clone_dir, self.remote_source) Sources.push(clone_dir, self.remote_source, *self.packages_update(result, clone_dir), commit_author=self.commit_author) diff --git a/src/ahriman/core/repository/executor.py b/src/ahriman/core/repository/executor.py index 4753d0b2..4e3f8ada 100644 --- a/src/ahriman/core/repository/executor.py +++ b/src/ahriman/core/repository/executor.py @@ -84,10 +84,9 @@ class Executor(Cleaner): result = Result() for single in updates: - with self.in_package_context(single.base), \ - TemporaryDirectory(ignore_cleanup_errors=True) as dir_name, (build_dir := Path(dir_name)): + with self.in_package_context(single.base), TemporaryDirectory(ignore_cleanup_errors=True) as dir_name: try: - build_single(single, build_dir) + build_single(single, Path(dir_name)) result.add_success(single) except Exception: self.reporter.set_failed(single.base)