This commit is contained in:
Kload 2013-06-07 13:30:44 +00:00
parent 4b35febec7
commit 2de2a2433e

View file

@ -619,16 +619,14 @@ def app_remove(app, instance=[]):
} }
if lvl(manifest, 'dependencies'): if lvl(manifest, 'dependencies'):
#_remove_app_dependencies(manifest['dependencies']) #TODO: _remove_app_dependencies(manifest['dependencies'])
pass pass
if lvl(manifest, 'yunohost', 'script_path'): if lvl(manifest, 'yunohost', 'script_path'):
_exec_app_script(step='remove', path=app_tmp_folder +'/'+ manifest['yunohost']['script_path'], var_dict=script_var_dict, app_type=manifest['type']) _exec_app_script(step='remove', path=app_tmp_folder +'/'+ manifest['yunohost']['script_path'], var_dict=script_var_dict, app_type=manifest['type'])
if is_web: if is_web:
if os.path.exists(lemon_tmp_conf): os.remove(lemon_tmp_conf) with open(lemon_tmp_conf, 'w') as lemon_conf:
with open(lemon_tmp_conf,'a') as lemon_conf:
hash = "$tmp->{'locationRules'}->{'"+ app_settings['domain'] +"'}" hash = "$tmp->{'locationRules'}->{'"+ app_settings['domain'] +"'}"
lemon_conf.write("foreach my $key (keys %{ "+ hash +" }) { delete "+ hash +"{$key} if $key =~ /"+ app_settings['uid'] +"/; }" + '\n') lemon_conf.write("foreach my $key (keys %{ "+ hash +" }) { delete "+ hash +"{$key} if $key =~ /"+ app_settings['uid'] +"/; }" + '\n')