YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Backup restore: Only ask that question about 'system already installed' if some system parts are actually going to be restored...

Browse source
This commit is contained in:
Alexandre Aubin 2020-11-16 18:41:31 +01:00
parent 144f98ad44
commit 0aaaeef807
1 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/yunohost/backup.py
View file

@ -2109,11 +2109,22 @@ def backup_restore(name, system=[], apps=[], force=False):
system = [] system = []
apps = [] apps = []
# TODO don't ask this question when restoring apps only and certain system #
# parts # Initialize #
#
# Check if YunoHost is installed restore_manager = RestoreManager(name)
if system is not None and os.path.isfile('/etc/yunohost/installed'):
restore_manager.set_system_targets(system)
restore_manager.set_apps_targets(apps)
restore_manager.assert_enough_free_space()
#
# Add validation if restoring system parts on an already-installed system
#
if restore_manager.targets.targets["system"] != [] and os.path.isfile('/etc/yunohost/installed'):
logger.warning(m18n.n('yunohost_already_installed')) logger.warning(m18n.n('yunohost_already_installed'))
if not force: if not force:
try: try:
@ -2128,20 +2139,6 @@ def backup_restore(name, system=[], apps=[], force=False):
if not force: if not force:
raise YunohostError('restore_failed') raise YunohostError('restore_failed')
# TODO Partial app restore could not work if ldap is not restored before
# TODO repair mysql if broken and it's a complete restore
#
# Initialize #
#
restore_manager = RestoreManager(name)
restore_manager.set_system_targets(system)
restore_manager.set_apps_targets(apps)
restore_manager.assert_enough_free_space()
# #
# Mount the archive then call the restore for each system part / app # # Mount the archive then call the restore for each system part / app #
# #