1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00

lvmdbusd/lvmdb.py: Make stand alone execution work

This was broken when the args were moved to cfg
This commit is contained in:
Tony Asleson 2016-08-29 14:52:41 -05:00
parent 96a0604bd0
commit 1870b3293a
2 changed files with 6 additions and 6 deletions

View File

@ -38,10 +38,6 @@ total_count = 0
# at the same time.
cmd_lock = threading.RLock()
# The actual method which gets called to invoke the lvm command, can vary
# from forking a new process to using lvm shell
_t_call = None
class LvmExecutionMeta(object):
@ -113,12 +109,16 @@ def call_lvm(command, debug=False):
_debug_c(command, process.returncode, (stdout_text, stderr_text))
if process.returncode == 0:
if cfg.args.debug and out[1] and len(out[1]) and 'help' not in command:
if cfg.args and cfg.args.debug and out[1] and len(out[1]) and \
'help' not in command:
log_error('WARNING: lvm is out-putting text to STDERR on success!')
_debug_c(command, process.returncode, (stdout_text, stderr_text))
return process.returncode, stdout_text, stderr_text
# The actual method which gets called to invoke the lvm command, can vary
# from forking a new process to using lvm shell
_t_call = call_lvm
def _shell_cfg():
global _t_call

View File

@ -262,7 +262,7 @@ def _common_log(msg, *attributes):
# @param msg Message to output to stdout
# @return None
def log_debug(msg, *attributes):
if cfg.args.debug:
if cfg.args and cfg.args.debug:
_common_log(msg, *attributes)