From 68fed450a9df832aa2b70f764c3af66500c4cf60 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Wed, 28 Aug 2019 15:16:34 -0700 Subject: [PATCH] backups: Rename remove_repository method to remove Since the method is being called on Repository classes, _repository suffix is redundant. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/backups/repository.py | 8 ++++---- plinth/modules/backups/views.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plinth/modules/backups/repository.py b/plinth/modules/backups/repository.py index 8da25ca24..b4b589c5b 100644 --- a/plinth/modules/backups/repository.py +++ b/plinth/modules/backups/repository.py @@ -170,7 +170,7 @@ class BaseBorgRepository(abc.ABC): return repository - def remove_repository(self): + def remove(self): """Remove a borg repository""" def list_archives(self): @@ -341,8 +341,8 @@ class BorgRepository(BaseBorgRepository): # Also, name isn't being used yet return self.repo_path - def remove_repository(self): - """Remove a repository from the kvstore and delete its mountpoint""" + def remove(self): + """Remove a repository from the kvstore.""" store.delete(self.uuid) @@ -403,7 +403,7 @@ class SshBorgRepository(BaseBorgRepository): self._run('sshfs', ['umount', '--mountpoint', self.mountpoint]) - def remove_repository(self): + def remove(self): """Remove a repository from the kvstore and delete its mountpoint""" self.umount() store.delete(self.uuid) diff --git a/plinth/modules/backups/views.py b/plinth/modules/backups/views.py index 7165504b5..6f75bb5f4 100644 --- a/plinth/modules/backups/views.py +++ b/plinth/modules/backups/views.py @@ -475,7 +475,7 @@ class RemoveRepositoryView(SuccessMessageMixin, TemplateView): def post(self, request, uuid): """Delete the repository on confirmation.""" repository = create_repository(uuid) - repository.remove_repository() + repository.remove() messages.success(request, _('Repository removed. Backups were not deleted.'))