From 1f6932eb82dcb42153543c81677d7251457e9f0f Mon Sep 17 00:00:00 2001 From: Evgenii Alekseev Date: Fri, 7 Mar 2025 01:33:46 +0200 Subject: [PATCH] revert version selection --- package/share/ahriman/templates/utils/style.jinja2 | 6 ++++-- src/ahriman/core/log/lazy_logging.py | 2 +- src/ahriman/core/repository/executor.py | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/share/ahriman/templates/utils/style.jinja2 b/package/share/ahriman/templates/utils/style.jinja2 index 1bc8b69c..d736dcee 100644 --- a/package/share/ahriman/templates/utils/style.jinja2 +++ b/package/share/ahriman/templates/utils/style.jinja2 @@ -28,7 +28,9 @@ right: 5px; } - .nav-link > .active { - color: black; + .nav-link.active { + pointer-events: none; + cursor: default; + color: black !important; } diff --git a/src/ahriman/core/log/lazy_logging.py b/src/ahriman/core/log/lazy_logging.py index ff7db2cf..8a69fd6c 100644 --- a/src/ahriman/core/log/lazy_logging.py +++ b/src/ahriman/core/log/lazy_logging.py @@ -74,7 +74,7 @@ class LazyLogging: def package_record_factory(*args: Any, **kwargs: Any) -> logging.LogRecord: record = current_factory(*args, **kwargs) - record.package_id = LogRecordId(package_base, version or "") + record.package_id = LogRecordId(package_base, version or "") return record logging.setLogRecordFactory(package_record_factory) diff --git a/src/ahriman/core/repository/executor.py b/src/ahriman/core/repository/executor.py index 6f9f0f8f..41755e79 100644 --- a/src/ahriman/core/repository/executor.py +++ b/src/ahriman/core/repository/executor.py @@ -75,7 +75,7 @@ class Executor(PackageInfo, Cleaner): result = Result() for single in updates: - with self.in_package_context(single.base, single.version), \ + with self.in_package_context(single.base, local_versions.get(single.base)), \ TemporaryDirectory(ignore_cleanup_errors=True) as dir_name: try: with self.in_event(single.base, EventType.PackageUpdated, failure=EventType.PackageUpdateFailed): @@ -194,6 +194,7 @@ class Executor(PackageInfo, Cleaner): self.repo.add(package_path) current_packages = {package.base: package for package in self.packages()} + local_versions = {package_base: package.version for package_base, package in current_packages.items()} removed_packages: list[str] = [] # list of packages which have been removed from the base updates = self.load_archives(packages) @@ -201,7 +202,7 @@ class Executor(PackageInfo, Cleaner): result = Result() for local in updates: - with self.in_package_context(local.base, local.version): + with self.in_package_context(local.base, local_versions.get(local.base)): try: packager = self.packager(packagers, local.base)