"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "salt/client/ssh/__init__.py" between
salt-3002.1.tar.gz and salt-3002.2.tar.gz

About: SaltStack is a systems management software for data center automation, cloud orchestration, server provisioning, configuration management and more. Community version.

__init__.py  (salt-3002.1):__init__.py  (salt-3002.2)
skipping to change at line 1059 skipping to change at line 1059
) )
) )
elif not os.path.exists(self.ssh_pre_flight): elif not os.path.exists(self.ssh_pre_flight):
log.error( log.error(
"The ssh_pre_flight script {} does not exist".format( "The ssh_pre_flight script {} does not exist".format(
self.ssh_pre_flight self.ssh_pre_flight
) )
) )
else: else:
stdout, stderr, retcode = self.run_ssh_pre_flight() stdout, stderr, retcode = self.run_ssh_pre_flight()
if stderr: if retcode != 0:
log.error( log.error(
"Error running ssh_pre_flight script {}".format( "Error running ssh_pre_flight script {}".format(
self.ssh_pre_file self.ssh_pre_file
) )
) )
return stdout, stderr, retcode return stdout, stderr, retcode
log.info( log.info(
"Successfully ran the ssh_pre_flight script: {}".format( "Successfully ran the ssh_pre_flight script: {}".format(
self.ssh_pre_file self.ssh_pre_file
) )
skipping to change at line 1379 skipping to change at line 1379
if self.winrm: if self.winrm:
target_shim_file = saltwinshell.get_target_shim_file(self, target_sh im_file) target_shim_file = saltwinshell.get_target_shim_file(self, target_sh im_file)
self.shell.send(shim_tmp_file.name, target_shim_file, makedirs=True) self.shell.send(shim_tmp_file.name, target_shim_file, makedirs=True)
# Remove our shim file # Remove our shim file
try: try:
os.remove(shim_tmp_file.name) os.remove(shim_tmp_file.name)
except OSError: except OSError:
pass pass
ret = self.execute_script( ret = self.execute_script(script=target_shim_file, extension=extension)
script=target_shim_file, extension=extension, pre_dir="$HOME/"
)
return ret return ret
def cmd_block(self, is_retry=False): def cmd_block(self, is_retry=False):
""" """
Prepare the pre-check command to send to the subsystem Prepare the pre-check command to send to the subsystem
1. execute SHIM + command 1. execute SHIM + command
2. check if SHIM returns a master request or if it completed 2. check if SHIM returns a master request or if it completed
3. handle any master request 3. handle any master request
 End of changes. 2 change blocks. 
4 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)