Merge branch 'master' of github.com:zonidjan/erebus

[erebus.git] / ctlmod.py

diff --git a/ctlmod.py b/ctlmod.py
index b6fe1a969c085a417821a0546c66dcc1e10a1836..b8244a8d6a37cc0b18aab56a339598a4e79100c4 100644 (file)
--- a/ctlmod.py
+++ b/ctlmod.py
@@ -15,6 +15,9 @@ def load(parent, modname):
                mod = __import__(modname)
                reload(mod)
 
+               if not hasattr(mod, 'modinfo'):
+                       return modlib.error('no modinfo')
+
                if 1 not in mod.modinfo['compatible']:
                        return modlib.error('API-incompatible')
 
@@ -45,7 +48,9 @@ def unload(parent, modname):
                        unload(parent, dependent)
                for dep in dependents[modname]:
                        dependents[dep].remove(modname)
-               return modules[modname].modstop(parent)
+               ret = modules[modname].modstop(parent)
+               del modules[modname]
+               return ret
        else:
                return modlib.error('already unloaded')