Commit daddc8d1 authored by Vitaly Lipatov's avatar Vitaly Lipatov

commit packed 3.21.7

parent 97518121
...@@ -2965,7 +2965,7 @@ epm_ni_install_names() ...@@ -2965,7 +2965,7 @@ epm_ni_install_names()
sudocmd aptitude -y install $@ sudocmd aptitude -y install $@
return ;; return ;;
yum-rpm) yum-rpm)
sudocmd yum -y --allowerasing $YUMOPTIONS install $(echo "$*" | exp_with_arch_suffix) sudocmd yum -y $YUMOPTIONS install $(echo "$*" | exp_with_arch_suffix)
return ;; return ;;
dnf-rpm) dnf-rpm)
sudocmd dnf -y --allowerasing $YUMOPTIONS install $(echo "$*" | exp_with_arch_suffix) sudocmd dnf -y --allowerasing $YUMOPTIONS install $(echo "$*" | exp_with_arch_suffix)
...@@ -3292,7 +3292,7 @@ epm_print_install_names_command() ...@@ -3292,7 +3292,7 @@ epm_print_install_names_command()
echo "aptitude -y install $*" echo "aptitude -y install $*"
return ;; return ;;
yum-rpm) yum-rpm)
echo "yum -y $YUMOPTIONS --allowerasing install $*" echo "yum -y $YUMOPTIONS install $*"
return ;; return ;;
dnf-rpm) dnf-rpm)
echo "dnf -y $YUMOPTIONS --allowerasing install $*" echo "dnf -y $YUMOPTIONS --allowerasing install $*"
...@@ -4603,6 +4603,8 @@ exp_with_arch_suffix() ...@@ -4603,6 +4603,8 @@ exp_with_arch_suffix()
local suffix local suffix
[ "$($DISTRVENDOR -a)" = "x86_64" ] || { cat ; return ; } [ "$($DISTRVENDOR -a)" = "x86_64" ] || { cat ; return ; }
[ "$DISTRNAME" = "ROSA" ] && { cat ; return ; }
# TODO: it is ok for ALT rpm to remove with this suffix # TODO: it is ok for ALT rpm to remove with this suffix
# TODO: separate install and remove? # TODO: separate install and remove?
case $PMTYPE in case $PMTYPE in
...@@ -8336,7 +8338,7 @@ filter_out_installed_packages() ...@@ -8336,7 +8338,7 @@ filter_out_installed_packages()
case $PMTYPE in case $PMTYPE in
yum-rpm|dnf-rpm) yum-rpm|dnf-rpm)
if [ "$($DISTRVENDOR -a)" = "x86_64" ] ; then if [ "$($DISTRVENDOR -a)" = "x86_64" ] && [ "$DISTRNAME" != "ROSA" ] ; then
# shellcheck disable=SC2013 # shellcheck disable=SC2013
for i in $(cat) ; do for i in $(cat) ; do
is_installed "$(__print_with_arch_suffix $i .x86_64)" && continue is_installed "$(__print_with_arch_suffix $i .x86_64)" && continue
...@@ -10948,7 +10950,7 @@ Examples: ...@@ -10948,7 +10950,7 @@ Examples:
print_version() print_version()
{ {
echo "EPM package manager version 3.21.6 https://wiki.etersoft.ru/Epm" echo "EPM package manager version 3.21.7 https://wiki.etersoft.ru/Epm"
echo "Running on $($DISTRVENDOR -e) ('$PMTYPE' package manager uses '$PKGFORMAT' package format)" echo "Running on $($DISTRVENDOR -e) ('$PMTYPE' package manager uses '$PKGFORMAT' package format)"
echo "Copyright (c) Etersoft 2012-2021" echo "Copyright (c) Etersoft 2012-2021"
echo "This program may be freely redistributed under the terms of the GNU AGPLv3." echo "This program may be freely redistributed under the terms of the GNU AGPLv3."
...@@ -10958,7 +10960,7 @@ print_version() ...@@ -10958,7 +10960,7 @@ print_version()
Usage="Usage: epm [options] <command> [package name(s), package files]..." Usage="Usage: epm [options] <command> [package name(s), package files]..."
Descr="epm - EPM package manager" Descr="epm - EPM package manager"
EPMVERSION=3.21.6 EPMVERSION=3.21.7
verbose=$EPM_VERBOSE verbose=$EPM_VERBOSE
quiet= quiet=
nodeps= nodeps=
......
...@@ -2260,7 +2260,7 @@ print_version() ...@@ -2260,7 +2260,7 @@ print_version()
local on_text="(host system)" local on_text="(host system)"
local virt="$($DISTRVENDOR -i)" local virt="$($DISTRVENDOR -i)"
[ "$virt" = "(unknown)" ] || [ "$virt" = "(host system)" ] || on_text="(under $virt)" [ "$virt" = "(unknown)" ] || [ "$virt" = "(host system)" ] || on_text="(under $virt)"
echo "Service manager version 3.21.6 https://wiki.etersoft.ru/Epm" echo "Service manager version 3.21.7 https://wiki.etersoft.ru/Epm"
echo "Running on $($DISTRVENDOR -e) $on_text with $SERVICETYPE" echo "Running on $($DISTRVENDOR -e) $on_text with $SERVICETYPE"
echo "Copyright (c) Etersoft 2012-2021" echo "Copyright (c) Etersoft 2012-2021"
echo "This program may be freely redistributed under the terms of the GNU AGPLv3." echo "This program may be freely redistributed under the terms of the GNU AGPLv3."
......
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