xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-31 10:06:39 +00:00
Code Issues Releases Wiki Activity

Attempting to default to latest if stable is specified in the main program versus the function calls.

Browse Source
This commit is contained in:
nicmays 2020-05-04 12:57:54 -04:00
parent 9b99c07d0d
commit 7bdad3e2fc
1 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
xCAT-server/share/xcat/tools/go-xcat
View File

@ -1322,13 +1322,6 @@ function add_xcat_core_repo_yum_or_zypper()
local ver="$2"
local tmp=""
[[ -z "${ver}" ]] && ver="latest"
echo "\nim here!!!!!\n"
if [[ ${ver} == "stable" ]]
then
ver="latest"
fi
if [[ -z "${url}" ]]
then
@ -1356,13 +1349,6 @@ function add_xcat_core_repo_apt()
local ver="$2"
local tmp=""
[[ -z "${ver}" ]] && ver="latest"
echo "\nim here2!!!!!\n"
if [[ ${ver} == "stable" ]]
then
ver="latest"
fi
if [[ -z "${url}" ]]
then
@ -1399,13 +1385,6 @@ function add_xcat_dep_repo_yum_or_zypper()
local ver="$2"
[[ -z "${ver}" ]] && ver="latest"
echo "\nim here3!!!!!\n"
if [[ ${ver} == "stable" ]]
then
ver="latest"
fi
local tmp=""
local install_path="${GO_XCAT_DEFAULT_INSTALL_PATH}"
local distro="${GO_XCAT_LINUX_DISTRO}${GO_XCAT_LINUX_VERSION%%.*}"
@ -1475,13 +1454,6 @@ function add_xcat_dep_repo_apt()
local ver="$2"
[[ -z "${ver}" ]] && ver="latest"
echo "\nim here4!!!!!\n"
if [[ ${ver} == "stable" ]]
then
ver="latest"
fi
[[ -z "${url}" ]] &&
url="${GO_XCAT_DEFAULT_BASE_URL}/apt/${ver}/xcat-dep"
add_repo_by_url_apt "${url}" "xcat-dep"
@ -2049,6 +2021,11 @@ do
shift
done
if [[ ${GO_XCAT_VERSION} == "stable" ]]
then
${GO_XCAT_VERSION} = "latest"
fi
case "${GO_XCAT_ACTION}" in
"away")
GO_XCAT_YES=("-y")