From 222e87daeb8f5d7e693830d4e0b8145b7cebf349 Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Mon, 10 Nov 2014 16:48:20 -0800
Subject: [PATCH] Rearrange init code slightly.
---
examples/cluster.py | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/examples/cluster.py b/examples/cluster.py
index e069185c..15dd9344 100755
--- a/examples/cluster.py
+++ b/examples/cluster.py
@@ -125,21 +125,20 @@ def __init__( self, name, server='localhost', user=None, serverIP=None,
self.server = server if server else 'localhost'
self.serverIP = serverIP if serverIP else self.findServerIP( self.server )
self.user = user if user else self.findUser()
+ self.controlPath = controlPath
+ self.splitInit = splitInit
if self.user and self.server != 'localhost':
self.dest = '%s@%s' % ( self.user, self.serverIP )
- self.isRemote = True
- else:
- self.isRemote = False
- self.dest = None
- self.controlPath = controlPath
- self.sshcmd = []
- if hasattr( self, 'server' ) and self.isRemote:
self.sshcmd = [ 'sudo', '-E', '-u', self.user ] + self.sshbase
if self.controlPath:
self.sshcmd += [ '-o', 'ControlPath=' + self.controlPath,
- '-o', 'ControlMaster=auto' ]
+ '-o', 'ControlMaster=auto' ]
self.sshcmd = self.sshcmd + [ self.dest ]
- self.splitInit = splitInit
+ self.isRemote = True
+ else:
+ self.dest = None
+ self.sshcmd = []
+ self.isRemote = False
super( RemoteMixin, self ).__init__( name, **kwargs )
@staticmethod
--
GitLab