From 6a836ae0bfd368d4928d9fd7316a7d3fb2cf49b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= Date: Thu, 31 Dec 2015 19:03:58 +0100 Subject: [PATCH] [fix] Parse app arguments before creating app folder and settings --- src/yunohost/app.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/yunohost/app.py b/src/yunohost/app.py index 4affccf12..aa245a5ea 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -444,6 +444,12 @@ def app_install(auth, app, label=None, args=None): # Change app_id to the forked app id app_id = app_id + '__' + str(instance_number) + # Retrieve arguments list for install script + args_dict = {} if not args else \ + dict(urlparse.parse_qsl(args, keep_blank_values=True)) + args_list = _parse_args_from_manifest(manifest, 'install', args_dict, auth) + args_list.append(app_id) + # Prepare App settings app_setting_path = apps_setting_path +'/'+ app_id @@ -471,12 +477,6 @@ def app_install(auth, app, label=None, args=None): os.system('chown -R admin: '+ app_tmp_folder) - # Retrieve arguments list for install script - args_dict = {} if not args else \ - dict(urlparse.parse_qsl(args, keep_blank_values=True)) - args_list = _parse_args_from_manifest(manifest, 'install', args_dict, auth) - args_list.append(app_id) - # Execute App install script os.system('chown -hR admin: %s' % install_tmp) # Move scripts and manifest to the right place