nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-13 10:30:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backups: allow creating archive in unmounted repository

Browse Source 
- mount repository if necessary before creating an archive

Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Michael Pimmer 2018-12-10 13:51:10 +01:00 committed by James Valleroy
parent 067fea7d17
commit b2f5d68ca6
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plinth/modules/backups/repository.py
View File

@ -359,9 +359,9 @@ def get_ssh_repositories():
return repositories return repositories
def get_repository(uuid): def get_repository(uuid, automount=False):
"""Get a repository (BorgRepository or SshBorgRepository)""" """Get a repository (BorgRepository or SshBorgRepository)"""
if uuid == ROOT_REPOSITORY_UUID: if uuid == ROOT_REPOSITORY_UUID:
return BorgRepository(path=ROOT_REPOSITORY) return BorgRepository(path=ROOT_REPOSITORY)
else: else:
return SshBorgRepository(uuid=uuid, automount=False) return SshBorgRepository(uuid=uuid, automount=automount)

3
plinth/modules/backups/views.py
View File

@ -92,7 +92,8 @@ class CreateArchiveView(SuccessMessageMixin, FormView):
def form_valid(self, form): def form_valid(self, form):
"""Create the archive on valid form submission.""" """Create the archive on valid form submission."""
repository = get_repository(form.cleaned_data['repository']) repository = get_repository(form.cleaned_data['repository'],
automount=True)
name = datetime.now().strftime('%Y-%m-%d:%H:%M') name = datetime.now().strftime('%Y-%m-%d:%H:%M')
repository.create_archive(name, form.cleaned_data['selected_apps']) repository.create_archive(name, form.cleaned_data['selected_apps'])
return super().form_valid(form) return super().form_valid(form)