Commit 8e47e735 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm prescription i586-fix: fix missed support

parent 568d53e8
...@@ -6,6 +6,11 @@ fatal() ...@@ -6,6 +6,11 @@ fatal()
exit 1 exit 1
} }
info()
{
echo "$*" >&2
}
is_root() is_root()
{ {
local EFFUID="$(id -u)" local EFFUID="$(id -u)"
......
...@@ -52,7 +52,7 @@ case "$vendor" in ...@@ -52,7 +52,7 @@ case "$vendor" in
"alt") "alt")
get_list_alt get_list_alt
;; ;;
"fedora"|"centos"|"redos") "fedora"|"centos"|"redos"|"rhel")
get_list_fedora get_list_fedora
;; ;;
*) *)
......
...@@ -11,7 +11,7 @@ case "$(epm print info -s)" in ...@@ -11,7 +11,7 @@ case "$(epm print info -s)" in
ubuntu|debian) ubuntu|debian)
epm --verbose --simulate remove $(epmqp "^i386-") epm --verbose --simulate remove $(epmqp "^i386-")
;; ;;
fedora|centos|redos) fedora|centos|redos|rhel)
epm --verbose --simulate remove $(epmqp "\.i686$") epm --verbose --simulate remove $(epmqp "\.i686$")
;; ;;
*) *)
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
vendor="$(epm print info -s)" vendor="$(epm print info -s)"
case "$vendor" in case "$vendor" in
"alt") "alt")
if epm --quiet repo list | grep -q "x86_64-i586 classic" ; then if epm --quiet repo list | grep -q "x86_64-i586 classic" ; then
...@@ -17,6 +16,11 @@ case "$vendor" in ...@@ -17,6 +16,11 @@ case "$vendor" in
epm update epm update
fi fi
;; ;;
exit
esac
pkgtype="$(epm print info -p)"
case "$pkgtype" in
"deb") "deb")
if a= dpkg --print-foreign-architectures | grep -q "i386" ; then if a= dpkg --print-foreign-architectures | grep -q "i386" ; then
#[ -n "$verbose" ] && info "This system is ready to install 32bit packages" #[ -n "$verbose" ] && info "This system is ready to install 32bit packages"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment