YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Change parse to action

Browse source
This commit is contained in:
Kloadut 2012-10-10 16:12:13 +02:00
parent c4bc8e2bce
commit 6a6f53b27d
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
yunohost
View file

@ -211,15 +211,17 @@ def main():
int -- 0 or error code
"""
parse = parse_dict(action_dict)
if parse['ldap']:
action = parse_dict(action_dict)
# Connect to LDAP if the action is requiring it
if action['ldap']:
yldap = YunoHostLDAP()
try:
if parse['ldap']:
result = parse['args'].func(vars(parse['args']), yldap)
if action['ldap']:
result = action['args'].func(vars(action['args']), yldap)
else:
result = parse['args'].func(vars(parse['args']))
result = action['args'].func(vars(action['args']))
except YunoHostError, error:
if not __debug__ :
traceback.print_exc()
@ -234,7 +236,7 @@ def main():
else:
print(json.dumps(result))
finally:
if parse['ldap']:
if action['ldap']:
yldap.disconnect()
return 0