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

add missed dnf5-support

parent 7735e633
...@@ -51,7 +51,7 @@ __use_url_install() ...@@ -51,7 +51,7 @@ __use_url_install()
pacman) pacman)
true true
;; ;;
yum-rpm|dnf-rpm) yum-rpm|dnf-rpm|dnf5-rpm)
true true
;; ;;
#zypper-rpm) #zypper-rpm)
...@@ -294,7 +294,7 @@ epm_download() ...@@ -294,7 +294,7 @@ epm_download()
assure_exists yumdownloader yum-utils assure_exists yumdownloader yum-utils
sudocmd yumdownloader $* sudocmd yumdownloader $*
;; ;;
dnf-rpm) dnf-rpm|dnf5-rpm)
sudocmd dnf download $* sudocmd dnf download $*
;; ;;
urpm-rpm) urpm-rpm)
......
...@@ -62,7 +62,7 @@ epm_install_files_rpm() ...@@ -62,7 +62,7 @@ epm_install_files_rpm()
info info
case $PMTYPE in case $PMTYPE in
yum-rpm|dnf-rpm) yum-rpm|dnf-rpm|dnf5-rpm)
YUMOPTIONS=--nogpgcheck YUMOPTIONS=--nogpgcheck
# use install_names # use install_names
;; ;;
......
...@@ -126,7 +126,7 @@ case $PMTYPE in ...@@ -126,7 +126,7 @@ case $PMTYPE in
apt-dpkg) apt-dpkg)
sudocmd apt-mark unhold "$@" sudocmd apt-mark unhold "$@"
;; ;;
dnf-rpm) dnf-rpm|dnf5-rpm)
__dnf_assure_versionlock __dnf_assure_versionlock
sudocmd dnf versionlock delete "$@" sudocmd dnf versionlock delete "$@"
;; ;;
...@@ -161,7 +161,7 @@ case $PMTYPE in ...@@ -161,7 +161,7 @@ case $PMTYPE in
apt-dpkg) apt-dpkg)
docmd apt-mark showhold "$@" docmd apt-mark showhold "$@"
;; ;;
dnf-rpm) dnf-rpm|dnf5-rpm)
# there is no hold entries without versionlock # there is no hold entries without versionlock
__dnf_is_supported_versionlock || return 0 __dnf_is_supported_versionlock || return 0
__dnf_assure_versionlock __dnf_assure_versionlock
...@@ -192,7 +192,7 @@ epm_mark_checkhold() ...@@ -192,7 +192,7 @@ epm_mark_checkhold()
{ {
# workaround against epm assure questions # workaround against epm assure questions
case $PMTYPE in case $PMTYPE in
dnf-rpm) dnf-rpm|dnf5-rpm)
# there is no hold entries without versionlock # there is no hold entries without versionlock
__dnf_is_supported_versionlock || return 1 __dnf_is_supported_versionlock || return 1
__dnf_assure_versionlock __dnf_assure_versionlock
...@@ -221,7 +221,7 @@ case $PMTYPE in ...@@ -221,7 +221,7 @@ case $PMTYPE in
apt-dpkg) apt-dpkg)
sudocmd apt-mark auto "$@" sudocmd apt-mark auto "$@"
;; ;;
dnf-rpm) dnf-rpm|dnf5-rpm)
sudocmd dnf mark remove "$@" sudocmd dnf mark remove "$@"
;; ;;
pacman) pacman)
...@@ -252,7 +252,7 @@ case $PMTYPE in ...@@ -252,7 +252,7 @@ case $PMTYPE in
apt-dpkg) apt-dpkg)
sudocmd apt-mark manual "$@" sudocmd apt-mark manual "$@"
;; ;;
dnf-rpm) dnf-rpm|dnf5-rpm)
sudocmd dnf mark install "$@" sudocmd dnf mark install "$@"
;; ;;
pacman) pacman)
...@@ -283,7 +283,7 @@ case $PMTYPE in ...@@ -283,7 +283,7 @@ case $PMTYPE in
apt-dpkg) apt-dpkg)
sudocmd apt-mark showauto "$@" sudocmd apt-mark showauto "$@"
;; ;;
dnf-rpm) dnf-rpm|dnf5-rpm)
sudocmd dnf repoquery --unneeded sudocmd dnf repoquery --unneeded
;; ;;
*) *)
...@@ -307,7 +307,7 @@ case $PMTYPE in ...@@ -307,7 +307,7 @@ case $PMTYPE in
apt-dpkg) apt-dpkg)
sudocmd apt-mark showmanual "$@" sudocmd apt-mark showmanual "$@"
;; ;;
dnf-rpm) dnf-rpm|dnf5-rpm)
sudocmd dnf repoquery --userinstalled sudocmd dnf repoquery --userinstalled
;; ;;
*) *)
......
...@@ -604,7 +604,7 @@ epm_release_upgrade() ...@@ -604,7 +604,7 @@ epm_release_upgrade()
showcmd rpm -Uvh http://mirror.yandex.ru/fedora/linux/releases/16/Fedora/x86_64/os/Packages/fedora-release-16-1.noarch.rpm showcmd rpm -Uvh http://mirror.yandex.ru/fedora/linux/releases/16/Fedora/x86_64/os/Packages/fedora-release-16-1.noarch.rpm
showcmd epm Upgrade showcmd epm Upgrade
;; ;;
dnf-rpm) dnf-rpm|dnf5-rpm)
if [ "$DISTRNAME/$DISTRVERSION" = "CentOS/8" ] ; then if [ "$DISTRNAME/$DISTRVERSION" = "CentOS/8" ] ; then
if [ "$1" = "RockyLinux" ] ; then if [ "$1" = "RockyLinux" ] ; then
info "https://github.com/rocky-linux/rocky-tools/tree/main/migrate2rocky/" info "https://github.com/rocky-linux/rocky-tools/tree/main/migrate2rocky/"
......
...@@ -224,7 +224,7 @@ epm_remove_nonint() ...@@ -224,7 +224,7 @@ epm_remove_nonint()
yum-rpm) yum-rpm)
sudocmd yum -y remove $@ sudocmd yum -y remove $@
return ;; return ;;
dnf-rpm) dnf-rpm|dnf5-rpm)
sudocmd dnf remove --assumeyes $@ sudocmd dnf remove --assumeyes $@
return ;; return ;;
zypper-rpm) zypper-rpm)
......
...@@ -32,7 +32,7 @@ filter_out_installed_packages() ...@@ -32,7 +32,7 @@ filter_out_installed_packages()
[ -z "$skip_installed" ] && cat && return [ -z "$skip_installed" ] && cat && return
case $PMTYPE in case $PMTYPE in
yum-rpm|dnf-rpm) yum-rpm|dnf-rpm|dnf5-rpm)
if [ "$DISTRARCH" = "x86_64" ] && [ "$DISTRNAME" != "ROSA" ] ; then if [ "$DISTRARCH" = "x86_64" ] && [ "$DISTRNAME" != "ROSA" ] ; then
# shellcheck disable=SC2013 # shellcheck disable=SC2013
for i in $(cat) ; do for i in $(cat) ; do
......
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