[Supervisor-checkins] r896 - in supervisor/trunk: . src/supervisor

[Chris McDonough]

Author: Chris McDonough <chrism at agendaless.com>
Date: Sun Oct  4 00:14:50 2009
New Revision: 896

Log:
  - Fixed a bug introduced in 3.0a7 where supervisorctl wouldn't ask
    for a username/password combination properly from a
    password-protected supervisord if it wasn't filled in within the
    "[supervisorctl]" section username/password values.  It now
    properly asks for a username and password.




Modified:
   supervisor/trunk/CHANGES.txt
   supervisor/trunk/src/supervisor/supervisorctl.py

Modified: supervisor/trunk/CHANGES.txt
==============================================================================
--- supervisor/trunk/CHANGES.txt	(original)
+++ supervisor/trunk/CHANGES.txt	Sun Oct  4 00:14:50 2009
@@ -1,5 +1,11 @@
 Next Release
 
+  - Fixed a bug introduced in 3.0a7 where supervisorctl wouldn't ask
+    for a username/password combination properly from a
+    password-protected supervisord if it wasn't filled in within the
+    "[supervisorctl]" section username/password values.  It now
+    properly asks for a username and password.
+
   - Fixed a bug introduced in 3.0a7 where setup.py would not detect the
     Python version correctly.  Patch by Daniele Paolella.
 

Modified: supervisor/trunk/src/supervisor/supervisorctl.py
==============================================================================
--- supervisor/trunk/src/supervisor/supervisorctl.py	(original)
+++ supervisor/trunk/src/supervisor/supervisorctl.py	Sun Oct  4 00:14:50 2009
@@ -117,7 +117,6 @@
                       'restart','start','stop','version','clear',
                       'fg','open','quit','remove','shutdown','status',
                       'tail','help']
-        self.info=self.get_supervisor().getAllProcessInfo()
         cmd.Cmd.__init__(self, completekey, stdin, stdout)
         for name, factory, kwargs in self.options.plugin_factories:
             plugin = factory(self, **kwargs)
@@ -235,7 +234,8 @@
         groups=[]
         programs=[]
         groupwiseprograms={}
-        for i in self.info:
+        info = self.get_supervisor().getAllProcessInfo()
+        for i in info:
             programs.append(i['name'])
             if i['group'] not in groups:
                 groups.append(i['group'])