Merge pull request #26591 from rallytime/bp-26554

Back-port #26554 to 2015.5
This commit is contained in:
Pedro Algarvio 2015-08-22 22:19:02 +01:00
commit 19992c1450

View File

@ -134,7 +134,7 @@ def main(argv): # pylint: disable=W0613
unpack_thin(thin_path)
# Salt thin now is available to use
else:
scpstat = subprocess.Popen(['/bin/bash', '-c', 'command -v scp']).wait()
scpstat = subprocess.Popen(['/bin/sh', '-c', 'command -v scp']).wait()
if not scpstat == 0:
sys.exit(EX_SCP_NOT_FOUND)