xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-07-24 13:21:12 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3328 from xuweibj/I3327

Browse Source 
Fix issue 3327, check environment of request type in openbmc and bmcdiscover
This commit is contained in:
zet809
2017-06-26 16:59:00 +08:00
committed by GitHub
parent 434e353a65 4176017b17
commit 911e092446
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-server/lib/xcat/plugins/bmcdiscover.pm
View File

@@ -85,6 +85,8 @@ sub process_request
#$::args = $request->{arg};
if (ref($request->{environment}) eq 'ARRAY' and ref($request->{environment}->[0]->{XCAT_DEV_WITHERSPOON}) eq 'ARRAY') {
$::XCAT_DEV_WITHERSPOON = $request->{environment}->[0]->{XCAT_DEV_WITHERSPOON}->[0];
} elsif (ref($request->{environment}) eq 'ARRAY') {
$::XCAT_DEV_WITHERSPOON = $request->{environment}->[0]->{XCAT_DEV_WITHERSPOON};
} else {
$::XCAT_DEV_WITHERSPOON = $request->{environment}->{XCAT_DEV_WITHERSPOON};
}

2
xCAT-server/lib/xcat/plugins/openbmc.pm
View File

@@ -283,6 +283,8 @@ sub preprocess_request {
if (ref($request->{environment}) eq 'ARRAY' and ref($request->{environment}->[0]->{XCAT_OPENBMC_DEVEL}) eq 'ARRAY') {
$::OPENBMC_DEVEL = $request->{environment}->[0]->{XCAT_OPENBMC_DEVEL}->[0];
} elsif (ref($request->{environment}) eq 'ARRAY') {
$::OPENBMC_DEVEL = $request->{environment}->[0]->{XCAT_OPENBMC_DEVEL};
} else {
$::OPENBMC_DEVEL = $request->{environment}->{XCAT_OPENBMC_DEVEL};
}