From 29bf70c57cd7ec24ac33d5688ccd75b2ac5bd101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Wed, 29 Aug 2018 18:54:39 +0200
Subject: [PATCH] Add hook name in return structure in hook_callback

---
 src/yunohost/hook.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/yunohost/hook.py b/src/yunohost/hook.py
index 3ef05980a..efd14ca75 100644
--- a/src/yunohost/hook.py
+++ b/src/yunohost/hook.py
@@ -230,7 +230,6 @@ def hook_callback(action, hooks=[], args=None, no_trace=False, chdir=None,
             (name, priority, path, succeed) as arguments
 
     """
-    result = {'succeed': {}, 'failed': {}, 'stdreturn' : []}
     hooks_dict = {}
 
     # Retrieve hooks
@@ -292,16 +291,11 @@ def hook_callback(action, hooks=[], args=None, no_trace=False, chdir=None,
                 post_callback(name=name, priority=priority, path=path,
                               succeed=True)
             try:
-                result[state][name].append(path)
+                result[name][state].append(path)
             except KeyError:
-                result[state][name] = [path]
+                result[name][state] = [path]
 
-            #print(hook_return)
-            #for r in hook_return.:
-            result['stdreturn'].extend(hook_return) #for r in hook_return
-                #print(r)
-
-    #print(result['stdreturn'])
+            result[name]['stdreturn'] = hook_return
     return result