From 9ce42ccf3e25c2b36f6281583ad8991f2f260275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Groniewsky?= Date: Tue, 30 Sep 2025 22:30:24 +0200 Subject: [PATCH] Added the config option to disable flatpaks (disabled by default), and the flag --no-flatpaks which will skip flatpak packages. --- src/decman/app.py | 19 ++++++++++++++++--- src/decman/config.py | 1 + 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/decman/app.py b/src/decman/app.py index 04854c1..787b9e0 100644 --- a/src/decman/app.py +++ b/src/decman/app.py @@ -1,3 +1,4 @@ +# pyright: reportUnusedCallResult=false """ Module containing the CLI Application. """ @@ -27,6 +28,7 @@ def main(): epilog="See more help at: https://github.com/kiviktnm/decman", ) + parser.add_argument( "--source", action="store", help="python file containing configuration" ) @@ -52,6 +54,12 @@ def main(): default=False, help="don't upgrade foreign packages", ) + parser.add_argument( + "--no-flatpaks", + action="store_true", + default=False, + help="don't upgrade flatpak packages", + ) parser.add_argument( "--no-files", action="store_true", default=False, help="don't install any files" ) @@ -177,6 +185,7 @@ def _set_up(store: l.Store, args): args.print, not args.no_packages, not args.no_foreign_packages, + not args.no_flatpaks not args.no_files, not args.no_systemd_units, not args.no_commands, @@ -195,6 +204,7 @@ class Core: self.only_print, self.update_packages, self.update_foreign_packages, + self.update_flatpaks, self.update_files, self.update_units, self.run_commands, @@ -279,7 +289,8 @@ class Core: self.pacman.remove(to_remove) # flatpak - self.flatpak.remove(to_remove_flatpak) + if conf.enable_flatpak and self.update_flatpaks: + self.flatpak.remove(to_remove_flatpak) def _upgrade_pkgs(self): """ @@ -297,7 +308,8 @@ class Core: ) # flatpak - self.flatpak.upgrade() + if conf.enable_flatpak and self.update_flatpaks: + self.flatpak.upgrade() def _install_pkgs(self): """ @@ -327,7 +339,8 @@ class Core: if conf.enable_fpm and self.update_foreign_packages: self.fpm.install(to_install_fpm, force=self.force_build) - self.flatpak.install(to_install_flatpak) + if conf.enable_flatpak and self.update_flatpaks: + self.flatpak.install(to_install_flatpak) def _create_and_remove_files(self): l.print_summary("Installing files.") diff --git a/src/decman/config.py b/src/decman/config.py index bb9686f..eda3cee 100644 --- a/src/decman/config.py +++ b/src/decman/config.py @@ -265,4 +265,5 @@ build_dir: str = "/tmp/decman/build" pkg_cache_dir: str = "/var/cache/decman" aur_rpc_timeout: typing.Optional[int] = 30 enable_fpm: bool = True +enable_flatpak: bool = False number_of_packages_stored_in_cache: int = 3