Merge "Drop meaningless translation marker"

This commit is contained in:
Zuul 2021-02-05 14:50:34 +00:00 committed by Gerrit Code Review
commit 9fe9424e82
2 changed files with 2 additions and 5 deletions

View File

@ -35,7 +35,6 @@ from oslo_utils import excutils
from oslo_utils import fileutils
import psutil
from neutron._i18n import _
from neutron.common import utils
from neutron.conf.agent import common as config
from neutron.privileged.agent.linux import utils as priv_utils
@ -142,7 +141,7 @@ def execute(cmd, process_input=None, addl_env=None,
if log_fail_as_error:
LOG.error(msg)
if check_exit_code:
raise exceptions.ProcessExecutionError(_(msg),
raise exceptions.ProcessExecutionError(msg,
returncode=returncode)
finally:
# NOTE(termie): this appears to be necessary to let the subprocess

View File

@ -25,8 +25,6 @@ from neutron_lib.utils import helpers
from oslo_log import log as logging
from oslo_utils import encodeutils
from neutron._i18n import _
if os.name == 'nt':
import wmi
@ -133,7 +131,7 @@ def execute(cmd, process_input=None, addl_env=None,
LOG.debug(log_msg)
if obj.returncode and check_exit_code:
raise exceptions.ProcessExecutionError(_(m), returncode=obj.returncode)
raise exceptions.ProcessExecutionError(m, returncode=obj.returncode)
return (_stdout, _stderr) if return_stderr else _stdout