Skip to content
Snippets Groups Projects
Commit 222e87da authored by Bob Lantz's avatar Bob Lantz
Browse files

Rearrange init code slightly.

parent a89ccb78
No related branches found
No related tags found
No related merge requests found
...@@ -125,21 +125,20 @@ def __init__( self, name, server='localhost', user=None, serverIP=None, ...@@ -125,21 +125,20 @@ def __init__( self, name, server='localhost', user=None, serverIP=None,
self.server = server if server else 'localhost' self.server = server if server else 'localhost'
self.serverIP = serverIP if serverIP else self.findServerIP( self.server ) self.serverIP = serverIP if serverIP else self.findServerIP( self.server )
self.user = user if user else self.findUser() self.user = user if user else self.findUser()
self.controlPath = controlPath
self.splitInit = splitInit
if self.user and self.server != 'localhost': if self.user and self.server != 'localhost':
self.dest = '%s@%s' % ( self.user, self.serverIP ) 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 self.sshcmd = [ 'sudo', '-E', '-u', self.user ] + self.sshbase
if self.controlPath: if self.controlPath:
self.sshcmd += [ '-o', 'ControlPath=' + self.controlPath, self.sshcmd += [ '-o', 'ControlPath=' + self.controlPath,
'-o', 'ControlMaster=auto' ] '-o', 'ControlMaster=auto' ]
self.sshcmd = self.sshcmd + [ self.dest ] 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 ) super( RemoteMixin, self ).__init__( name, **kwargs )
@staticmethod @staticmethod
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment