From 28c524e8243f9eb41f2ecb7197e33711727526d9 Mon Sep 17 00:00:00 2001
From: necoro <>
Date: Wed, 25 Apr 2007 16:05:46 +0000
Subject: added noroot-option

---
 portato/plugin.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'portato/plugin.py')

diff --git a/portato/plugin.py b/portato/plugin.py
index 4c5070e..3d67f5b 100644
--- a/portato/plugin.py
+++ b/portato/plugin.py
@@ -299,7 +299,7 @@ class PluginQueue:
 				except AttributeError:
 					debug(cmd.hook.call,"cannot be imported", error = 1)
 
-			f(*hargs, **hkwargs) # call function
+			return f(*hargs, **hkwargs) # call function
 
 		def hook_decorator (func):
 			"""This is the real decorator."""
@@ -310,6 +310,8 @@ class PluginQueue:
 
 			def wrapper (*args, **kwargs):
 				
+				ret = None
+
 				# before
 				for cmd in list[0]:
 					debug("Accessing hook '%s' of plugin '%s' (before)" % (hook, cmd.hook.plugin.name))
@@ -317,15 +319,17 @@ class PluginQueue:
 				
 				if list[1]: # override
 					debug("Overriding hook '%s' with plugin '%s'" % (hook, list[1][0].hook.plugin.name))
-					call(list[1][0])
+					ret = call(list[1][0])
 				else: # normal
-					func(*args, **kwargs)
+					ret = func(*args, **kwargs)
 
 				# after
 				for cmd in list[2]:
 					debug("Accessing hook '%s' of plugin '%s' (after)" % (hook, cmd.hook.plugin.name))
 					call(cmd)
 
+				return ret
+
 			return wrapper
 
 		return hook_decorator
-- 
cgit v1.2.3