From f82ff37c2bf63900c8cdbfbf4b45e8c794a9319f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Fri, 31 Mar 2017 15:29:09 +0800 Subject: [PATCH 1/2] [go-xcat] Ignore any error of `yum clean metadata` --- xCAT-server/share/xcat/tools/go-xcat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat index b445b04a8..370481f0f 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.15 +# Version 1.0.16 # # Copyright (C) 2016 International Business Machines # Eclipse Public License, Version 1.0 (EPL-1.0) @@ -955,6 +955,7 @@ function remove_repo_yum() # This is a quick and dirty method. rm -f $(grep -l "^\[${repo_id}\]$" "/etc/yum.repos.d/"*".repo" 2>/dev/null) yum clean metadata + : } # $1 repo id From 9e245025caa692b3cede577df72d9f8a6dc16859 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Thu, 13 Apr 2017 16:29:21 +0800 Subject: [PATCH 2/2] [go-xcat] Fix zypper repository querying. Search packages in repository only. --- xCAT-server/share/xcat/tools/go-xcat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat index 370481f0f..a9d7da03f 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.16 +# Version 1.0.17 # # Copyright (C) 2016 International Business Machines # Eclipse Public License, Version 1.0 (EPL-1.0) @@ -517,7 +517,7 @@ function check_repo_version_zypper() do name+=("${name}") ver+=("${ver}") - done < <(zypper --no-gpg-checks -n search -s --match-exact "$@" \ + done < <(zypper --no-gpg-checks -n search -u -s --match-exact "$@" \ 2>/dev/null | awk -F ' *\\| *' '/ package / { print $2, $4 }') local -i i while [[ -n "$1" ]]