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

add YNH_DEFAULT_PHP_VERSION in backup.py

Browse source
This commit is contained in:
Kay0u 2020-04-12 16:37:55 +02:00
parent b0cd37aeca
commit 2fcc93fcc8
No known key found for this signature in database
GPG key ID: AE1DCADB6415A156
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/yunohost/backup.py
View file

@ -51,6 +51,7 @@ from yunohost.hook import (
from yunohost.tools import tools_postinstall from yunohost.tools import tools_postinstall
from yunohost.regenconf import regen_conf from yunohost.regenconf import regen_conf
from yunohost.log import OperationLogger from yunohost.log import OperationLogger
from yunohost.app import APPS_DEFAULT_PHP_VERSION
from functools import reduce from functools import reduce
BACKUP_PATH = '/home/yunohost.backup' BACKUP_PATH = '/home/yunohost.backup'
@ -561,6 +562,7 @@ class BackupManager():
env_var["YNH_APP_ID"] = app_id env_var["YNH_APP_ID"] = app_id
env_var["YNH_APP_INSTANCE_NAME"] = app env_var["YNH_APP_INSTANCE_NAME"] = app
env_var["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb) env_var["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
env_var["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
tmp_app_dir = os.path.join('apps/', app) tmp_app_dir = os.path.join('apps/', app)
tmp_app_bkp_dir = os.path.join(self.work_dir, tmp_app_dir, 'backup') tmp_app_bkp_dir = os.path.join(self.work_dir, tmp_app_dir, 'backup')
env_var["YNH_APP_BACKUP_DIR"] = tmp_app_bkp_dir env_var["YNH_APP_BACKUP_DIR"] = tmp_app_bkp_dir
@ -1411,6 +1413,7 @@ class RestoreManager():
env_dict_remove["YNH_APP_ID"] = app_id env_dict_remove["YNH_APP_ID"] = app_id
env_dict_remove["YNH_APP_INSTANCE_NAME"] = app_instance_name env_dict_remove["YNH_APP_INSTANCE_NAME"] = app_instance_name
env_dict_remove["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb) env_dict_remove["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
env_dict_remove["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
operation_logger = OperationLogger('remove_on_failed_restore', operation_logger = OperationLogger('remove_on_failed_restore',
[('app', app_instance_name)], [('app', app_instance_name)],
@ -1458,6 +1461,7 @@ class RestoreManager():
env_var["YNH_APP_ID"] = app_id env_var["YNH_APP_ID"] = app_id
env_var["YNH_APP_INSTANCE_NAME"] = app env_var["YNH_APP_INSTANCE_NAME"] = app
env_var["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb) env_var["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
env_var["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
env_var["YNH_APP_BACKUP_DIR"] = app_backup_in_archive env_var["YNH_APP_BACKUP_DIR"] = app_backup_in_archive
return env_var return env_var