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

Connection bug fix

Browse source
This commit is contained in:
Kloadut 2012-10-14 17:44:16 +02:00 • committed by Alexis Gavoty
parent 0dd522f64a
commit 59fc6cc3fc
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
parse_args
View file

@ -523,7 +523,7 @@ def connect_services(action_map):
action_map -- Map of actions action_map -- Map of actions
Returns: Returns:
Dict|int -- openned connections or error code Dict -- openned connections or error code
""" """
action_dict = action_map[sys.argv[1]]['actions'][sys.argv[2]] action_dict = action_map[sys.argv[1]]['actions'][sys.argv[2]]
@ -542,7 +542,7 @@ def connect_services(action_map):
# TODO: Add other services connections # TODO: Add other services connections
except YunoHostError, error: except YunoHostError, error:
display_error(error) display_error(error)
return error.code sys.exit(error.code)
else: else:
return connections return connections
@ -554,10 +554,11 @@ def disconnect_services(connections):
connections -- Dictionnary of openned connections connections -- Dictionnary of openned connections
Returns: Returns:
Boolean|int Boolean
""" """
try: try:
print connections
if 'ldap' in connections: if 'ldap' in connections:
connections['ldap'].disconnect() connections['ldap'].disconnect()
if 'firewall' in connections: if 'firewall' in connections:
@ -565,7 +566,7 @@ def disconnect_services(connections):
# TODO: Add other services deconnections # TODO: Add other services deconnections
except YunoHostError, error: except YunoHostError, error:
display_error(error) display_error(error)
return error.code sys.exit(error.code)
else: else:
return True return True