From: Alfredo Deza Date: Mon, 12 Mar 2018 20:52:15 +0000 (-0400) Subject: ceph-volume process the abspath of the executable first X-Git-Tag: v13.1.0~564^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8d4b0058ab19497b1082a2c4c1fa404ebe8050bd;p=ceph.git ceph-volume process the abspath of the executable first So that it can always log the full path to the executable when it is logging the 'Running command:' line Signed-off-by: Alfredo Deza --- diff --git a/src/ceph-volume/ceph_volume/process.py b/src/ceph-volume/ceph_volume/process.py index 501c830d99cbc..4c2ef55b90be8 100644 --- a/src/ceph-volume/ceph_volume/process.py +++ b/src/ceph-volume/ceph_volume/process.py @@ -108,11 +108,11 @@ def run(command, **kw): :param stop_on_error: If a nonzero exit status is return, it raises a ``RuntimeError`` :param fail_msg: If a nonzero exit status is returned this message will be included in the log """ + executable = which(command.pop(0)) + command.insert(0, executable) stop_on_error = kw.pop('stop_on_error', True) command_msg = obfuscate(command, kw.pop('obfuscate', None)) fail_msg = kw.pop('fail_msg', None) - executable = which(command.pop(0)) - command.insert(0, executable) logger.info(command_msg) terminal.write(command_msg) terminal_logging = kw.pop('terminal_logging', True) @@ -174,11 +174,11 @@ def call(command, **kw): it is forcefully set to True if a return code is non-zero :param logfile_verbose: Log stderr/stdout output to log file. Defaults to True """ + executable = which(command.pop(0)) + command.insert(0, executable) terminal_verbose = kw.pop('terminal_verbose', False) logfile_verbose = kw.pop('logfile_verbose', True) show_command = kw.pop('show_command', False) - executable = which(command.pop(0)) - command.insert(0, executable) command_msg = "Running command: %s" % ' '.join(command) stdin = kw.pop('stdin', None) logger.info(command_msg)