RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-20 18:33:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

use the absolute path for executables if found

Browse Source 
Signed-off-by: Alfredo Deza <alfredo@deza.pe>
This commit is contained in:
Alfredo Deza 2013-12-12 11:16:38 -05:00
parent 43561f7916
commit a9334a1c8c
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ceph-disk
View File

@ -227,14 +227,23 @@ def which(executable):
return executable_path
def _check_command_executable(arguments):
"""raise if the executable is not found"""
def _get_command_executable(arguments):
"""
Return the full path for an executable, raise if the executable is not
found. If the executable has already a full path do not perform any checks.
"""
if arguments[0].startswith('/'): # an absolute path
return arguments
executable = which(arguments[0])
if not executable:
command_msg = 'Could not run command: %s' % ' '.join(arguments)
executable_msg = '%s not in path.' % arguments[0]
raise ExecutableNotFound('%s %s' % (executable_msg, command_msg))
# swap the old executable for the new one
arguments[0] = executable
return arguments
def command(arguments):
"""
@ -246,7 +255,7 @@ def command(arguments):
since it provides the caller with the safety net of making sure that
executables *will* be found and will error nicely otherwise.
"""
_check_command_executable(arguments)
arguments = _get_command_executable(arguments)
return subprocess.Popen(
arguments,