Skip to content

epm install: fix i586 tasks install (eterbug #19008) #608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Boria138 wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

epm install: fix i586 tasks install (eterbug #19008) #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bin/epm-install-alt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
11 changes: 7 additions & 4 deletions bin/epm-sh-altlinux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion bin/epm-sh-backend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down