Bugfix: raise a KeyError, don't return it.

[software/pymin.git] / pymin / procman.py

diff --git a/pymin/procman.py b/pymin/procman.py
index 9242d86723f5ae2a2562aaaf148986797ffc0a66..12c269cb564146f97a306cc320a4222e5b18297a 100644 (file)
--- a/pymin/procman.py
+++ b/pymin/procman.py
@@ -84,7 +84,7 @@ class ProcessManager:
 
     def stop(self, name):
         assert name in self.namemap
 
     def stop(self, name):
         assert name in self.namemap

-        self.namemap[name].stop(name)
+        self.namemap[name].stop()

 
     def kill(self, name, signum):
         assert name in self.namemap
 
     def kill(self, name, signum):
         assert name in self.namemap


@@ -131,7 +131,7 @@ class ProcessManager:
         else: # is a pid
             if name in self.pidmap:
                 return self.pidmap[name]
         else: # is a pid
             if name in self.pidmap:
                 return self.pidmap[name]

-        return KeyError, name
+        raise KeyError, name

 
     def has(self, name):
         if isinstance(name, basestring): # is a name
 
     def has(self, name):
         if isinstance(name, basestring): # is a name