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

[go-xcat] Fix repository query and force problem resolution for zypper (#2876)

Browse Source 
* [go-xcat] Fix the issue in upgrade on SLES as some packages vendor name is changed.
This commit is contained in:
neo954 2017-04-21 14:10:10 +08:00 committed by Bin Xu
parent 087ad35e4b
commit b9e36a58fc
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
#
# go-xcat - Install xCAT automatically.
#
# Version 1.0.17
# Version 1.0.19
#
# Copyright (C) 2016 International Business Machines
# Eclipse Public License, Version 1.0 (EPL-1.0)
@ -517,8 +517,9 @@ function check_repo_version_zypper()
do
name+=("${name}")
ver+=("${ver}")
done < <(zypper --no-gpg-checks -n search -u -s --match-exact "$@" \
2>/dev/null | awk -F ' *\\| *' '/ package / { print $2, $4 }')
done < <(zypper --no-gpg-checks -n search --match-exact -C -t package \
-s "$@" 2>/dev/null |
awk -F ' +\\| +' '/ package / { if ("(" != substr($6, 0, 1)) print $2, $4 }')
local -i i
while [[ -n "$1" ]]
do
@ -592,6 +593,7 @@ function get_package_list_yum()
[[ -z "${repo_id}" ]] && return 1
repoquery -qa "--repoid=${repo_id}" --qf "%{name}" 2>/dev/null
}
# $1 repo id
function get_package_list_zypper()
{
@ -599,7 +601,7 @@ function get_package_list_zypper()
local repo_id="$1"
[[ -z "${repo_id}" ]] && return 1
zypper --no-gpg-checks -n search -r "${repo_id}" 2>/dev/null |
awk -F ' *\\| *' '/ package$/ { print $2 }'
awk -F ' +\\| +' '/ package$/ { print $2 }'
}
# $1 repo id
@ -1180,7 +1182,7 @@ function install_packages_zypper()
type zypper >/dev/null 2>&1 || return 255
local -a yes=()
[[ "$1" = "-y" ]] && yes=("-n") && shift
zypper --no-gpg-checks "${yes[@]}" install "$@"
zypper --no-gpg-checks "${yes[@]}" install --force-resolution "$@"
}
function install_packages_apt()