afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' into feature/config-service

Browse source
This commit is contained in:
Blake Harnden 2020-01-17 21:13:07 -08:00
commit 43fe81a86e
13 changed files with 40 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
daemon/core/nodes/base.py
View file

@ -111,7 +111,7 @@ class NodeBase:
:param wait: True to wait for status, False otherwise
:param shell: True to use shell, False otherwise
:return: combined stdout and stderr
:raises CoreCommandError: when a non-zero exit status occurs
:raises CoreCommandError: when a non-zero exit status occurs
"""
if self.server is None:
return utils.cmd(args, env, cwd, wait, shell)
@ -426,7 +426,7 @@ class CoreNodeBase(NodeBase):
:param wait: True to wait for status, False otherwise
:param shell: True to use shell, False otherwise
:return: combined stdout and stderr
:raises CoreCommandError: when a non-zero exit status occurs
:raises CoreCommandError: when a non-zero exit status occurs
"""
raise NotImplementedError
@ -607,7 +607,7 @@ class CoreNode(CoreNodeBase):
:param wait: True to wait for status, False otherwise
:param shell: True to use shell, False otherwise
:return: combined stdout and stderr
:raises CoreCommandError: when a non-zero exit status occurs
:raises CoreCommandError: when a non-zero exit status occurs
"""
if self.server is None:
return self.client.check_cmd(args, wait=wait, shell=shell)