- Fixed http://www.plope.com/software/collector/215 (bad error

    message in supervisorctl when program command not found on PATH).

CHANGES.txt

@@ -225,6 +225,9 @@ Next Release
 
   - The 'identifier' command-line argument was not functional.
 
+  - Fixed http://www.plope.com/software/collector/215 (bad error
+    message in supervisorctl when program command not found on PATH).
+
 3.0a2
 
   - Fixed the README.txt example for defining the supervisor RPC

TODO.txt

@@ -1,5 +1,13 @@
+- Allow supervisorctl's tail -f to work over unix domain socket.
+
+- Allow effective user to switch to a particular group instead of
+  defaulting to the user's primary group:
+  http://www.plope.com/software/collector/233.
+
+- Allow sockchown group only: http://www.plope.com/software/collector/214
+
 - Change license to http://dist.repoze.org/LICENSE.txt (same license,
-  just no mention of Zope).
+  just no "Zope" anywhere).
 
 - Implement event max_retry counter that means "after X retries of a
   rejected event, go into FATAL state".
@@ -16,9 +24,6 @@
    - When we try to kill a process and the os.kill command raises an
      exception (stopProcess)
 
-- Make *:9001 work for port num (see
-  http://www.plope.com/software/collector/247)
-
 - Generalize eventlistener request/response protocol (wrap OK/FAIL in
   RESULT envelope) so we can use it for more specialized
   communications, e.g.:

src/supervisor/options.py

@@ -1579,6 +1579,8 @@ def _init_signames():
             d[v] = k
     _signames = d
 
+# miscellaneous utility functions
+
 def expand(s, expansions, name):
     try:
         return s % expansions
@@ -1620,6 +1622,8 @@ def dedupe(L):
         D[thing] = 1
     return D.keys()
 
+# exceptions
+
 class ProcessException(Exception):
     """ Specialized exceptions used when attempting to start a process """
 

src/supervisor/process.py

@@ -124,16 +124,20 @@ class Subprocess:
             
         else:
             path = self.config.options.get_path()
-            filename = None
+            found = None
             st = None
             for dir in path:
-                filename = os.path.join(dir, program)
+                found = os.path.join(dir, program)
                 try:
-                    st = self.config.options.stat(filename)
+                    st = self.config.options.stat(found)
                 except OSError:
-                    filename = None
+                    pass
                 else:
                     break
+            if st is None:
+                filename = program
+            else:
+                filename = found
 
         # check_execv_args will raise a ProcessException if the execv
         # args are bogus, we break it out into a separate options

src/supervisor/tests/test_process.py

@@ -109,14 +109,14 @@ class SubprocessTests(unittest.TestCase):
         config = DummyPConfig(options, 'notthere', 'notthere')
         instance = self._makeOne(config)
         args = instance.get_execv_args()
-        self.assertEqual(args, (None, ['notthere']))
+        self.assertEqual(args, ('notthere', ['notthere']))
 
     def test_get_execv_args_rel_withquotes_missing(self):
         options = DummyOptions()
         config = DummyPConfig(options, 'notthere', 'notthere "an argument"')
         instance = self._makeOne(config)
         args = instance.get_execv_args()
-        self.assertEqual(args, (None, ['notthere', 'an argument']))
+        self.assertEqual(args, ('notthere', ['notthere', 'an argument']))
 
     def test_get_execv_args_abs(self):
         executable = '/bin/sh foo'