Commit 08a45519 authored by Vitaly Lipatov's avatar Vitaly Lipatov

commit packed 3.64.36

parent c5f8b334
...@@ -34,7 +34,7 @@ SHAREDIR="$PROGDIR" ...@@ -34,7 +34,7 @@ SHAREDIR="$PROGDIR"
# will replaced with /etc/eepm during install # will replaced with /etc/eepm during install
CONFIGDIR="$PROGDIR/../etc" CONFIGDIR="$PROGDIR/../etc"
export EPMVERSION="3.64.35" export EPMVERSION="3.64.36"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
...@@ -438,6 +438,12 @@ warning() ...@@ -438,6 +438,12 @@ warning()
echog "$*" >&2 echog "$*" >&2
} }
fatal_warning()
{
[ -n "$force" ] || fatal "$@"
warning "$@"
}
info() info()
{ {
[ -n "$quiet" ] && return [ -n "$quiet" ] && return
...@@ -9209,7 +9215,7 @@ epm_release_downgrade() ...@@ -9209,7 +9215,7 @@ epm_release_downgrade()
docmd epm install dnf docmd epm install dnf
#docmd epm install epel-release yum-utils #docmd epm install epel-release yum-utils
sudocmd dnf --refresh upgrade sudocmd dnf --refresh upgrade
sudocmd dnf clean all #sudocmd dnf clean all
assure_exists dnf-plugin-system-upgrade assure_exists dnf-plugin-system-upgrade
sudocmd dnf upgrade --refresh sudocmd dnf upgrade --refresh
local RELEASEVER="$1" local RELEASEVER="$1"
...@@ -9794,13 +9800,13 @@ epm_release_upgrade() ...@@ -9794,13 +9800,13 @@ epm_release_upgrade()
return return
;; ;;
"OpenMandrivaLx") "OpenMandrivaLx")
sudocmd dnf clean all #sudocmd dnf clean all
sudocmd dnf distro-sync --allowerasing sudocmd dnf distro-sync --allowerasing
return return
;; ;;
"ROSA") "ROSA")
sudocmd dnf --refresh upgrade || fatal sudocmd dnf --refresh upgrade || fatal
sudocmd dnf clean all #sudocmd dnf clean all
DV=$(echo "$DISTRVERSION" | sed -e "s|\..*||") DV=$(echo "$DISTRVERSION" | sed -e "s|\..*||")
[ "$DV" = "2021" ] && DV=12 [ "$DV" = "2021" ] && DV=12
local RELEASEVER="$1" local RELEASEVER="$1"
...@@ -9875,7 +9881,7 @@ epm_release_upgrade() ...@@ -9875,7 +9881,7 @@ epm_release_upgrade()
if [ "$DISTRNAME" = "RockyLinux" ] ; then if [ "$DISTRNAME" = "RockyLinux" ] ; then
sudocmd dnf --refresh upgrade || fatal sudocmd dnf --refresh upgrade || fatal
sudocmd dnf clean all #sudocmd dnf clean all
info "Check https://www.centlinux.com/2022/07/upgrade-your-servers-from-rocky-linux-8-to-9.html" info "Check https://www.centlinux.com/2022/07/upgrade-your-servers-from-rocky-linux-8-to-9.html"
info "For upgrading your yum repositories from Rocky Linux 8 to 9 ..." info "For upgrading your yum repositories from Rocky Linux 8 to 9 ..."
epm install "https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/Packages/r/rocky-gpg-keys*.rpm" || fatal epm install "https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/Packages/r/rocky-gpg-keys*.rpm" || fatal
...@@ -9898,7 +9904,7 @@ epm_release_upgrade() ...@@ -9898,7 +9904,7 @@ epm_release_upgrade()
info "Check https://fedoraproject.org/wiki/DNF_system_upgrade for an additional info" info "Check https://fedoraproject.org/wiki/DNF_system_upgrade for an additional info"
#docmd epm install epel-release yum-utils #docmd epm install epel-release yum-utils
sudocmd dnf --refresh upgrade || fatal sudocmd dnf --refresh upgrade || fatal
sudocmd dnf clean all #sudocmd dnf clean all
assure_exists dnf-plugin-system-upgrade assure_exists dnf-plugin-system-upgrade
sudocmd dnf upgrade --refresh sudocmd dnf upgrade --refresh
local RELEASEVER="$1" local RELEASEVER="$1"
...@@ -10711,6 +10717,14 @@ __epm_repack_single() ...@@ -10711,6 +10717,14 @@ __epm_repack_single()
local pkg="$1" local pkg="$1"
case $PKGFORMAT in case $PKGFORMAT in
rpm) rpm)
if [ "$BASEDISTRNAME" = "alt" ] ; then
if epm status --original "$pkg" ; then
fatal_warning "Repacking package $pkg from ALT repository is dangerous and forbidden (see https://bugzilla.altlinux.org/56355)."
fi
if epm status --repacked "$pkg" ; then
fatal_warning "Repacking already repacked package $pkg is uselessly."
fi
fi
__epm_repack_to_rpm "$pkg" || return __epm_repack_to_rpm "$pkg" || return
;; ;;
deb) deb)
...@@ -14457,7 +14471,8 @@ epm_status_original() ...@@ -14457,7 +14471,8 @@ epm_status_original()
return 0 return 0
;; ;;
*) *)
fatal 'Unsupported $DISTRNAME' warning 'Status checking is not supported yet for $DISTRNAME'
return 1
;; ;;
esac esac
return 1 return 1
......
...@@ -34,7 +34,7 @@ SHAREDIR=$PROGDIR ...@@ -34,7 +34,7 @@ SHAREDIR=$PROGDIR
# will replaced with /etc/eepm during install # will replaced with /etc/eepm during install
CONFIGDIR=$PROGDIR/../etc CONFIGDIR=$PROGDIR/../etc
EPMVERSION="3.64.35" EPMVERSION="3.64.36"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
...@@ -435,6 +435,12 @@ warning() ...@@ -435,6 +435,12 @@ warning()
echog "$*" >&2 echog "$*" >&2
} }
fatal_warning()
{
[ -n "$force" ] || fatal "$@"
warning "$@"
}
info() info()
{ {
[ -n "$quiet" ] && return [ -n "$quiet" ] && return
......
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