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

Gotta make sure everything is a string

Browse source
This commit is contained in:
Alexandre Aubin 2020-12-05 21:06:37 +01:00
parent 81f3b493e4
commit efdb2ee6b5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/yunohost/app.py
View file

@ -2761,7 +2761,7 @@ def _make_environment_for_app_script(app, args={}, args_prefix="APP_ARG_"):
} }
for arg_name, arg_value_and_type in args.items(): for arg_name, arg_value_and_type in args.items():
env_dict["YNH_%s%s" % (args_prefix, arg_name.upper())] = arg_value_and_type[0] env_dict["YNH_%s%s" % (args_prefix, arg_name.upper())] = str(arg_value_and_type[0])
return env_dict return env_dict

2
src/yunohost/hook.py
View file

@ -391,7 +391,7 @@ def _hook_exec_bash(path, args, chdir, env, return_format, loggers):
env['YNH_STDRETURN'] = stdreturn env['YNH_STDRETURN'] = stdreturn
# use xtrace on fd 7 which is redirected to stdout # use xtrace on fd 7 which is redirected to stdout
env['BASH_XTRACEFD'] = 7 env['BASH_XTRACEFD'] = "7"
cmd = '/bin/bash -x "{script}" {args} 7>&1' cmd = '/bin/bash -x "{script}" {args} 7>&1'
cmd = cmd.format(script=cmd_script, args=cmd_args) cmd = cmd.format(script=cmd_script, args=cmd_args)