diff --git a/bin/epm-install-alt b/bin/epm-install-alt index a8ffc510..41d162b6 100644 --- a/bin/epm-install-alt +++ b/bin/epm-install-alt @@ -386,16 +386,16 @@ epm_install_alt_tasks() [ -n "$verbose" ] && info "Packages from task(s): $installlist" if [ -n "$full" ] ; then - installlist="$(estrlist reg_exclude ".*-checkinstall .*-debuginfo" "$installlist")" + installlist="$(estrlist reg_exclude ".*-checkinstall .*-debuginfo.*" "$installlist")" else # hack: drop -devel packages to avoid package provided by multiple packages - installlist="$(estrlist reg_exclude ".*-devel .*-devel-static .*-checkinstall .*-debuginfo" "$installlist")" + installlist="$(estrlist reg_exclude ".*-devel .*-devel-static .*-checkinstall .*-debuginfo.*" "$installlist")" fi # TODO: need we this option? #if [ -z "$force" ] ; then # # skip i586- on install - installlist="$(estrlist reg_exclude "i586-.*" "$installlist")" + #installlist="$(estrlist reg_exclude "i586-.*" "$installlist")" #fi [ -n "$verbose" ] && info "Packages to install: $installlist" diff --git a/bin/epm-sh-altlinux b/bin/epm-sh-altlinux index 459995f5..57dd6f5c 100644 --- a/bin/epm-sh-altlinux +++ b/bin/epm-sh-altlinux @@ -107,7 +107,13 @@ get_task_packages_list() local res res="$(fetch_url $ALTTASKURL/$tn/plan/add-bin)" || return - echo "$res" | cut -f1-3 | grep -E "(noarch|$DISTRARCH)$" | cut -f1 + echo "$res" | cut -f1-3 | grep -E "(noarch|$DISTRARCH|i586)$" | while read -r name ver arch; do + if [ "$arch" = "i586" ] ; then + echo "$name.32bit" + else + echo "$name" + fi + done } get_task_arepo_packages_list() @@ -137,8 +143,5 @@ get_task_packages() continue fi get_task_packages_list "$tn" - [ "$DISTRARCH" = "x86_64" ] || continue - get_task_arepo_status "$tn" || continue - get_task_arepo_packages_list "$tn" done } diff --git a/bin/epm-sh-backend b/bin/epm-sh-backend index f2388ff5..c50bf064 100644 --- a/bin/epm-sh-backend +++ b/bin/epm-sh-backend @@ -199,7 +199,7 @@ __generate_task_sourceslist() local url="https://git.altlinux.org/tasks/$tn/build/repo" url="$(eget --get-real-url "$url")" || { warning "Can't access task $tn repo" ; continue ; } local arch - for arch in noarch $DISTRARCH $([ "$DISTRARCH" = "x86_64" ] && echo "x86_64-i586") ; do + for arch in noarch $DISTRARCH $([ "$DISTRARCH" = "x86_64" ] && echo "i586 x86_64-i586") ; do eget --check-url "$url/$arch/base/" 2>/dev/null || continue local rd="$(eget --list "$url/$arch/RPMS.*" 2>/dev/null)" [ -n "$rd" ] || continue