msmith - in flumotion/trunk: . flumotion/admin/gtk

[flumotion-commit at lists.fluendo.com]

Author: msmith
Date: Thu Mar 22 13:38:56 2007
New Revision: 4679

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/admin/gtk/main.py
Log:
        * flumotion/admin/gtk/main.py:
          Fix specifying admin on command line.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Thu Mar 22 13:38:56 2007
@@ -1,5 +1,10 @@
 2007-03-22  Michael Smith  <msmith at fluendo.com>
 
+	* flumotion/admin/gtk/main.py:
+	  Fix specifying admin on command line.
+
+2007-03-22  Michael Smith  <msmith at fluendo.com>
+
 	* flumotion/admin/gtk/client.py:
 	  Don't use undefined variables if setup() raises.
 	* flumotion/component/producers/looper/admin_gtk.py:

Modified: flumotion/trunk/flumotion/admin/gtk/main.py
==============================================================================
--- flumotion/trunk/flumotion/admin/gtk/main.py	(original)
+++ flumotion/trunk/flumotion/admin/gtk/main.py	Thu Mar 22 13:38:56 2007
@@ -79,7 +79,6 @@
     info = connections.parsePBConnectionInfo(managerString, useSSL)
     model = AdminModel(info.authenticator)
     d = model.connectToHost(info.host, info.port, not info.use_ssl)
-    d.addErrback(failure)
     return d
 
 def main(args):
@@ -127,7 +126,7 @@
                   'too many argument: %r' % (args[1:],))
 
     if options.manager:
-        d = startAdminFromManagerString(options.managers,
+        d = startAdminFromManagerString(options.manager,
                                         not options.no_ssl)
     else:
         d = startAdminFromGreeter(Greeter())