From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 23 May 2014 22:51:07 +0000 (+0100)
Subject: service.py: Have SSHRemoteService use its superclass's `name' slot.
X-Git-Tag: 1.1.0~11
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/chopwood/commitdiff_plain/7789d380771f23a87b12487219a8ea24da5ef886

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 52debfb..c04e99e 100644
--- 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.
     """
-    super(SSHRemoteService, me).__init__(*args, **kw)
+    super(SSHRemoteService, me).__init__(name = name, *args, **kw)
     me._remote = remote
-    me._name = name
 
   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."""
-    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."""
-    me._run_noout(['clear', me._name, user])
+    me._run_noout(['clear', me.name, user])
 
 CONF.export('SSHRemoteService')