From c7ac6b3d11a3e17f485b714dc92b0c8d8524f3d1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Wed, 29 Jun 2016 12:28:29 +0800 Subject: [PATCH] [go-xcat] Print more friendly error message, when command `repoquery' is not found --- xCAT-server/share/xcat/tools/go-xcat | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat index ca81ccd57..73a8e05e9 100755 --- a/xCAT-server/share/xcat/tools/go-xcat +++ b/xCAT-server/share/xcat/tools/go-xcat @@ -422,7 +422,8 @@ function check_repo_version_dnf() # $@ package names function check_repo_version_yum() { - type repoquery >/dev/null 2>&1 || return 255 + type yum >/dev/null 2>&1 || return 255 + check_exec_or_exit repoquery local -a name=() local -a ver=() while read name ver @@ -526,7 +527,8 @@ function get_package_list_dnf() # $1 repo id function get_package_list_yum() { - type repoquery >/dev/null 2>&1 || return 255 + type yum >/dev/null 2>&1 || return 255 + check_exec_or_exit repoquery local repo_id="$1" [[ -z "${repo_id}" ]] && return 1 repoquery -qa "--repoid=${repo_id}" --qf "%{name}" 2>/dev/null