From b9e36a58fc6ea113afc0b830791a605ac6b4a022 Mon Sep 17 00:00:00 2001
From: neo954 <gongjie@linux.vnet.ibm.com>
Date: Fri, 21 Apr 2017 14:10:10 +0800
Subject: [PATCH] [go-xcat] Fix repository query and force problem resolution
 for zypper (#2876)

* [go-xcat] Fix the issue in upgrade on SLES as some packages vendor name is changed.
---
 xCAT-server/share/xcat/tools/go-xcat | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat
index a9d7da03f..b09adea6d 100755
--- a/xCAT-server/share/xcat/tools/go-xcat
+++ b/xCAT-server/share/xcat/tools/go-xcat
@@ -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()