From f203009cea34411a235f7f007f462d340c1cd31d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Mon, 27 Jun 2016 16:51:20 +0800 Subject: [PATCH] [go-xcat] Fix issue #1398. Remove the support of local repoitory file on Debian/Ubuntu --- xCAT-server/share/xcat/tools/go-xcat | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat index 458877d0c..e4314f4a5 100755 --- a/xCAT-server/share/xcat/tools/go-xcat +++ b/xCAT-server/share/xcat/tools/go-xcat @@ -582,11 +582,13 @@ function add_repo_by_file_yum() exit_if_bad "$?" "empty repo id" [[ "${repo_id}" =~ ^[a-zA-Z][0-9a-zA-Z-]*$ ]] exit_if_bad "$?" "${repo_id} illegal character in repo id" - remove_repo_yum "${repo_id}" + local tmp="${TMP_DIR}/tmp_repo_file_${repo_id}.repo" { echo "[${repo_id}]" grep -v '^\[' "${repo_file}" - } >"/etc/yum.repos.d/${repo_id}.repo" + } >"${tmp}" + remove_repo_yum "${repo_id}" && + cp "${tmp}" "/etc/yum.repos.d/${repo_id}.repo" } # $1 repo file @@ -604,13 +606,13 @@ function add_repo_by_file_zypper() exit_if_bad "$?" "empty repo id" [[ "${repo_id}" =~ ^[a-zA-Z][0-9a-zA-Z-]*$ ]] exit_if_bad "$?" "${repo_id} illegal character in repo id" - local tmp_repo_file="${TMP_DIR}/${repo_id}.repo" + local tmp="${TMP_DIR}/tmp_repo_file_${repo_id}.repo" { echo "[${repo_id}]" grep -v '^\[' "${repo_file}" - } >"${tmp_repo_file}" - remove_repo_zypper "${repo_id}" - zypper addrepo "${tmp_repo_file}" >/dev/null 2>&1 + } >"${tmp}" + remove_repo_zypper "${repo_id}" && + zypper addrepo "${tmp}" >/dev/null 2>&1 } # $1 repo file @@ -810,12 +812,6 @@ function add_repo_by_url_apt() esac if [[ -f "${url}" ]] then - case "${url##*.}" in - "list") # local repo file - add_repo_by_file_apt "${url}" "${repo_id}" - return "$?" - ;; - esac extract_archive "${url}" "${repo_id}" "${install_path}" warn_if_bad "$?" "extract ${repo_id} archive file failed" || return 1