service.py: Have SSHRemoteService use its superclass's `name' slot.

For some reason it invented its own instead.  This seems rather
pointless.

diff --git a/service.py b/service.py
index 52debfbfe1670ac33605a2ba9df827710dc7e325..c04e99e3218b9de4dd9ad26769cf1cee8cacf147 100644 (file)
--- a/service.py
+++ b/service.py
@@ -281,25 +281,24 @@ class SSHRemoteService (BasicRemoteService):
     (probably of the form `LOGIN@HOSTNAME') and referring to the service
     NAME.
     """
     (probably of the form `LOGIN@HOSTNAME') and referring to the service
     NAME.
     """

-    super(SSHRemoteService, me).__init__(*args, **kw)
+    super(SSHRemoteService, me).__init__(name = name, *args, **kw)

     me._remote = remote
     me._remote = remote

-    me._name = name

 
   def _describe(me):
     """Description of the remote service."""
 
   def _describe(me):
     """Description of the remote service."""

-    return "`%s' via SSH to `%s'" % (me._name, me._remote),
+    return "`%s' via SSH to `%s'" % (me.name, me._remote),

 
 

-  def _mkcmd(me, cmd):
+  def _mkcmd(me, cmd, state):

     """Format a command for SSH.  Mainly escaping arguments."""
     return ['ssh', me._remote, ' '.join(map(CGI.urlencode, cmd))]
 
   def setpasswd(me, user, passwd):
     """Service protocol: set the USER's password to PASSWD."""
     """Format a command for SSH.  Mainly escaping arguments."""
     return ['ssh', me._remote, ' '.join(map(CGI.urlencode, cmd))]
 
   def setpasswd(me, user, passwd):
     """Service protocol: set the USER's password to PASSWD."""

-    me._run_noout(['set', me._name, user], passwd + '\n')
+    me._run_noout(['set', me.name, user], passwd + '\n')

 
   def clearpasswd(me, user):
     """Service protocol: clear the USER's password."""
 
   def clearpasswd(me, user):
     """Service protocol: clear the USER's password."""

-    me._run_noout(['clear', me._name, user])
+    me._run_noout(['clear', me.name, user])

 
 CONF.export('SSHRemoteService')
 
 
 CONF.export('SSHRemoteService')