From 3174e390ffa2d92035ee58709191567a48c0727c Mon Sep 17 00:00:00 2001 From: Tian jianyong <11429339@qq.com> Date: Thu, 19 Dec 2024 18:50:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=BB=E7=BA=BF=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/prepare_offline_packages.sh | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/scripts/prepare_offline_packages.sh b/scripts/prepare_offline_packages.sh index 0c7b750..9f618b8 100644 --- a/scripts/prepare_offline_packages.sh +++ b/scripts/prepare_offline_packages.sh @@ -133,8 +133,14 @@ for pkg in "${PACKAGES[@]}"; do # Handle package groups yum ${YUM_ARCH} groupinfo "${pkg#@}" | grep "Mandatory Packages:" -A 100 | grep "^[[:space:]]*[^[:space:]]*" >> "$TEMP_PKGS" else - echo "$pkg" >> "$TEMP_PKGS" - get_dependencies "$pkg" >> "$TEMP_PKGS" + # For Python packages, don't use architecture flag + if [[ "$pkg" == python* ]]; then + yum groupinfo "${pkg#@}" | grep "Mandatory Packages:" -A 100 | grep "^[[:space:]]*[^[:space:]]*" >> "$TEMP_PKGS" + get_dependencies "$pkg" >> "$TEMP_PKGS" + else + echo "$pkg" >> "$TEMP_PKGS" + get_dependencies "$pkg" >> "$TEMP_PKGS" + fi fi done @@ -146,9 +152,17 @@ log_info "Downloading packages..." DOWNLOAD_FAILED=0 while read -r pkg; do log_info "Downloading $pkg..." - if ! yum ${YUM_ARCH} install --downloadonly --downloaddir="${PACKAGES_DIR}" "$pkg"; then - log_error "Failed to download $pkg" - DOWNLOAD_FAILED=1 + # For Python packages, don't use architecture flag + if [[ "$pkg" == python* ]]; then + if ! yum install --downloadonly --downloaddir="${PACKAGES_DIR}" "$pkg"; then + log_error "Failed to download $pkg" + DOWNLOAD_FAILED=1 + fi + else + if ! yum ${YUM_ARCH} install --downloadonly --downloaddir="${PACKAGES_DIR}" "$pkg"; then + log_error "Failed to download $pkg" + DOWNLOAD_FAILED=1 + fi fi done < "$TEMP_PKGS"