From 5be1b1ad2ba3c2473f4fc2b88cfced4d9bb3f528 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Tue, 6 Jun 2023 10:18:21 -0700 Subject: [PATCH] shaarli: Utilize purging of packages and don't remove explicitly Tests: - Uninstall shaarli and notice that /var/lib/shaarli directory has been removed. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/shaarli/__init__.py | 7 +------ plinth/modules/shaarli/privileged.py | 12 ------------ 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 plinth/modules/shaarli/privileged.py diff --git a/plinth/modules/shaarli/__init__.py b/plinth/modules/shaarli/__init__.py index 5d78ed37a..ed7f054f2 100644 --- a/plinth/modules/shaarli/__init__.py +++ b/plinth/modules/shaarli/__init__.py @@ -12,7 +12,7 @@ from plinth.modules.backups.components import BackupRestore from plinth.modules.firewall.components import Firewall from plinth.package import Packages -from . import manifest, privileged +from . import manifest _description = [ _('Shaarli allows you to save and share bookmarks.'), @@ -69,8 +69,3 @@ class ShaarliApp(app_module.App): """Install and configure the app.""" super().setup(old_version) self.enable() - - def uninstall(self): - """De-configure and uninstall the app.""" - super().uninstall() - privileged.uninstall() diff --git a/plinth/modules/shaarli/privileged.py b/plinth/modules/shaarli/privileged.py deleted file mode 100644 index fc26a3ce6..000000000 --- a/plinth/modules/shaarli/privileged.py +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later -"""Configure Shaarli.""" - -import shutil - -from plinth.actions import privileged - - -@privileged -def uninstall(): - """Remove Shaarli's data directory.""" - shutil.rmtree('/var/lib/shaarli/data', ignore_errors=True)