From 5f5b3182b1df153e5d549252b4da707ce5b9cbcf Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Tue, 2 Mar 2021 12:41:44 -0300 Subject: [PATCH] [flatpak] fix -> displaying duplicate runtimes on the upgrade summary when a runtime is available at the system and user levels --- CHANGELOG.md | 1 + bauh/gems/flatpak/controller.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a4e783f..45ec5f6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Not properly treating a dependency version before comparing with others (could display that a given dependency was not found) - Flatpak + - displaying duplicate runtimes on the upgrade summary when a runtime is available at the system and user levels - installation level tooltip not being localized - displaying installation level tooltip for not installed apps diff --git a/bauh/gems/flatpak/controller.py b/bauh/gems/flatpak/controller.py index 30e57a91..10c8ed0e 100644 --- a/bauh/gems/flatpak/controller.py +++ b/bauh/gems/flatpak/controller.py @@ -630,8 +630,9 @@ class FlatpakManager(SoftwareManager): all_runtimes = [] for runtime in runtimes: for partial in partials: - if partial.base_id == runtime.id: + if partial.installation == runtime.installation and partial.base_id == runtime.id: all_runtimes.append(partial) + break all_runtimes.append(runtime) return [*all_runtimes, *apps]