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

[fix] Copy app backup script with proper permissions to be executed

Browse source
This commit is contained in:
Jérôme Lebleu 2015-10-01 03:19:51 +02:00
parent 89b6b79e60
commit e5fa8556cf
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/yunohost/backup.py
View file

@ -29,8 +29,8 @@ import sys
import json import json
import errno import errno
import time import time
import shutil
import tarfile import tarfile
import subprocess
from moulinette.core import MoulinetteError from moulinette.core import MoulinetteError
from moulinette.utils.log import getActionLogger from moulinette.utils.log import getActionLogger
@ -149,6 +149,7 @@ def backup_create(name=None, description=None, output_directory=None,
apps_filtered = apps_list apps_filtered = apps_list
# Run apps backup scripts # Run apps backup scripts
tmp_script = '/tmp/backup_' + str(timestamp)
for app_id in apps_filtered: for app_id in apps_filtered:
script = '/etc/yunohost/apps/{:s}/scripts/backup'.format(app_id) script = '/etc/yunohost/apps/{:s}/scripts/backup'.format(app_id)
if not os.path.isfile(script): if not os.path.isfile(script):
@ -159,7 +160,8 @@ def backup_create(name=None, description=None, output_directory=None,
try: try:
msignals.display(m18n.n('backup_running_app_script', app_id)) msignals.display(m18n.n('backup_running_app_script', app_id))
hook_exec(script, args=[tmp_dir]) subprocess.call(['install', '-Dm555', script, tmp_script])
hook_exec(tmp_script, args=[tmp_dir])
except: except:
logger.exception("error while executing script '%s'", script) logger.exception("error while executing script '%s'", script)
msignals.display(m18n.n('unbackup_app', app_id), msignals.display(m18n.n('unbackup_app', app_id),
@ -170,6 +172,7 @@ def backup_create(name=None, description=None, output_directory=None,
info['apps'][app_id] = { info['apps'][app_id] = {
'version': i['version'], 'version': i['version'],
} }
subprocess.call(['rm', '-f', tmp_script])
# Create backup info file # Create backup info file
with open("%s/info.json" % tmp_dir, 'w') as f: with open("%s/info.json" % tmp_dir, 'w') as f: