From 9b10819823e82a03247477a0ea396edcab194291 Mon Sep 17 00:00:00 2001 From: goajos Date: Sun, 14 Dec 2025 00:43:21 +0100 Subject: [PATCH 1/2] flatpak bug v0.4.1 fix: https://github.com/kiviktnm/decman/issues/35 --- src/decman/app.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/decman/app.py b/src/decman/app.py index 578d168..04c8041 100644 --- a/src/decman/app.py +++ b/src/decman/app.py @@ -282,11 +282,12 @@ class Core: # pacman currently_installed = self.pacman.get_installed() to_remove = self.source.packages_to_remove(currently_installed) - - currently_installed_flatpak = self.flatpak.get_installed() - to_remove_flatpak = self.source.flatpak_packages_to_remove( - currently_installed_flatpak - ) + + if conf.enable_flatpak and self.update_flatpaks: + currently_installed_flatpak = self.flatpak.get_installed() + to_remove_flatpak = self.source.flatpak_packages_to_remove( + currently_installed_flatpak + ) l.print_list("Removing pacman packages:", to_remove) @@ -371,10 +372,11 @@ class Core: to_install_fpm = self.source.foreign_packages_to_install(currently_installed) # flatpak - currently_installed_flatpak = self.flatpak.get_installed() - to_install_flatpak = self.source.flatpak_packages_to_install( - currently_installed_flatpak - ) + if conf.enable_flatpak and self.update_flatpaks: + currently_installed_flatpak = self.flatpak.get_installed() + to_install_flatpak = self.source.flatpak_packages_to_install( + currently_installed_flatpak + ) l.print_list("Installing pacman packages:", to_install_pacman) From 837d32ac43ef4a45b8026653f2e53fd3b9475825 Mon Sep 17 00:00:00 2001 From: Kivi Kaitaniemi Date: Sun, 14 Dec 2025 17:14:35 +0200 Subject: [PATCH 2/2] Release v0.4.2 --- README.md | 4 ++-- example/my_module.py | 2 +- example/source.py | 2 +- pyproject.toml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 93d5f3a..2b39e6c 100644 --- a/README.md +++ b/README.md @@ -171,7 +171,7 @@ decman.user_packages.append( decman.UserPackage( pkgname="decman-git", provides=["decman"], - version="0.4.1", + version="0.4.2", dependencies=["python", "python-requests", "devtools", "pacman", "systemd", "git"], make_dependencies=[ "python-setuptools", "python-build", "python-installer", "python-wheel" @@ -303,7 +303,7 @@ user_packages = [{ # Also, this example may be out of date pkgname="decman-git", provides=["decman"], - version="0.4.1", + version="0.4.2", dependencies=["python", "python-requests", "devtools", "pacman", "systemd", "git"], make_dependencies=[ "python-setuptools", "python-build", "python-installer", "python-wheel" diff --git a/example/my_module.py b/example/my_module.py index 2140c37..fcdc1f9 100644 --- a/example/my_module.py +++ b/example/my_module.py @@ -89,7 +89,7 @@ class MyModule(Module): return [ UserPackage( pkgname="decman-git", - version="0.4.1", + version="0.4.2", provides=["decman"], dependencies=[ "python", diff --git a/example/source.py b/example/source.py index 2ba643e..504709e 100644 --- a/example/source.py +++ b/example/source.py @@ -57,7 +57,7 @@ decman.config.makepkg_user = "kk" decman.user_packages.append( UserPackage( pkgname="decman-git", - version="0.4.1", + version="0.4.2", provides=["decman"], dependencies=[ "python", diff --git a/pyproject.toml b/pyproject.toml index f01a631..d5deb1b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "decman" -version = "0.4.1" +version = "0.4.2" description = "Declarative package & configuration manager for Arch Linux." license = {file = "LICENSE"} authors = [