From 3452ab89759b13120f84f18f14a9a7735c4f367d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20Moreira?= Date: Thu, 30 Jan 2020 15:44:15 -0300 Subject: [PATCH] [fix][flatpak] retrieving info from a partial for Flatpak < 1.4 --- bauh/gems/flatpak/controller.py | 5 ++++- bauh/gems/flatpak/model.py | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bauh/gems/flatpak/controller.py b/bauh/gems/flatpak/controller.py index 99e5521c..ce496caf 100644 --- a/bauh/gems/flatpak/controller.py +++ b/bauh/gems/flatpak/controller.py @@ -197,7 +197,10 @@ class FlatpakManager(SoftwareManager): def get_info(self, app: FlatpakApplication) -> dict: if app.installed: - app_info = flatpak.get_app_info_fields(app.id, app.branch, app.installation) + version = flatpak.get_version() + id_ = app.base_id if app.partial and version < '1.5' else app.id + app_info = flatpak.get_app_info_fields(id_, app.branch, app.installation) + app_info['id'] = id_ app_info['name'] = app.name app_info['type'] = 'runtime' if app.runtime else 'app' app_info['description'] = strip_html(app.description) if app.description else '' diff --git a/bauh/gems/flatpak/model.py b/bauh/gems/flatpak/model.py index 880f54e0..8ae20ec1 100644 --- a/bauh/gems/flatpak/model.py +++ b/bauh/gems/flatpak/model.py @@ -22,6 +22,7 @@ class FlatpakApplication(SoftwarePackage): self.partial = False self.installation = installation if installation else 'system' self.i18n = i18n + self.base_id = None if runtime: self.categories = ['runtime'] @@ -77,6 +78,7 @@ class FlatpakApplication(SoftwarePackage): def gen_partial(self, partial_id: str) -> "FlatpakApplication": partial = copy.deepcopy(self) partial.id = partial_id + partial.base_id = self.id if self.ref: partial.ref = '/'.join((partial_id, *self.ref.split('/')[1:]))