xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 09:36:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4887 from whowutwut/python_error_msg

Browse Source 
Improve the error message when python dependencies are not met
This commit is contained in:
Mark Gurevich 2018-03-05 13:20:56 -05:00 committed by GitHub
commit f76b81ba38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-openbmc-py/lib/python/agent/xcatagent/server.py
View File

@ -106,7 +106,7 @@ class Server(object):
self.server.stop()
os._exit(0)
except ImportError:
messager.error("xCAT mgt=openbmc is using a Python based framework and there are some dependencies that are not met.")
messager.error("OpenBMC management is using a Python framework and some dependency libraries could not be imported.")
print(traceback.format_exc(), file=sys.stderr)
self.server.stop()
os._exit(1)

4
xCAT-server/lib/perl/xCAT/OPENBMC.pm
View File

@ -137,7 +137,7 @@ sub submit_agent_request {
$retry++;
}
if (!defined($sock)) {
xCAT::MsgUtils->message("E", { data => ["Failed to connect to the agent"] }, $callback);
xCAT::MsgUtils->message("E", { data => ["OpenBMC management is using a Python framework. An error has occured when trying to create socket $AGENT_SOCK_PATH."] }, $callback);
kill('TERM', $pid);
return;
}
@ -195,7 +195,7 @@ sub wait_agent {
my ($pid, $callback) = @_;
waitpid($pid, 0);
if ($? >> 8 != 0) {
xCAT::MsgUtils->message("E", { data => ["python agent exited unexpectedly. See $PYTHON_LOG_PATH for more details."] }, $callback);
xCAT::MsgUtils->message("E", { data => ["Agent exited unexpectedly. See $PYTHON_LOG_PATH for details."] }, $callback);
}
}