diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b9681db..86a6142e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [0.2.1] - 2019-06-22 +### Fixes +- Retrieving information for the same AppId with different branches. + ## [0.2.0] - 2019-06-18 ### Features - Management panel shows update commands streams diff --git a/fpakman/core/flatpak.py b/fpakman/core/flatpak.py index fa9ca0bf..82ea400d 100755 --- a/fpakman/core/flatpak.py +++ b/fpakman/core/flatpak.py @@ -32,7 +32,7 @@ def app_str_to_json(line: str, version: str) -> dict: else: raise Exception('Unsupported version') - info = re.findall('\w+:\s.+', get_app_info(app['id'])) + info = re.findall(r'\w+:\s.+', get_app_info(app['id'], app['branch'])) fields_to_get = ['origin', 'arch', 'ref'] for field in info: @@ -53,8 +53,8 @@ def get_version(): return res.split(' ')[1].strip() if res else None -def get_app_info(app_id: str): - return system.run_cmd('flatpak info ' + app_id) +def get_app_info(app_id: str, branch: str): + return system.run_cmd('flatpak info {} {}'.format(app_id, branch)) def list_installed() -> List[dict]: