Commit 5ae0dd91 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm release-upgrade: install altlinux-release-* if /etc/altlinux-release…

epm release-upgrade: install altlinux-release-* if /etc/altlinux-release differents from target distro
parent 74ee56f7
...@@ -83,6 +83,7 @@ __wcount() ...@@ -83,6 +83,7 @@ __wcount()
echo "$*" | wc -w echo "$*" | wc -w
} }
# TODO: remove it or move to distro_info
__detect_alt_release_by_repo() __detect_alt_release_by_repo()
{ {
local BRD=$(cat /etc/apt/sources.list /etc/apt/sources.list.d/*.list \ local BRD=$(cat /etc/apt/sources.list /etc/apt/sources.list.d/*.list \
...@@ -231,7 +232,7 @@ __check_system() ...@@ -231,7 +232,7 @@ __check_system()
fi fi
if [ "$TO" != "Sisyphus" ] ; then if [ "$TO" != "Sisyphus" ] ; then
if epm installed altlinux-release-sisyphus >/dev/null ; then if [ "$($DISTRVENDOR -v)" != "$TO" ] || epm installed altlinux-release-sisyphus >/dev/null ; then
warning "Target distro is $TO, but altlinux-release-sisyphus package is installed." warning "Target distro is $TO, but altlinux-release-sisyphus package is installed."
warning "Trying to replace it with altlinux-release-$TO" warning "Trying to replace it with altlinux-release-$TO"
docmd epm install altlinux-release-$TO docmd epm install altlinux-release-$TO
...@@ -482,6 +483,7 @@ epm_release_upgrade() ...@@ -482,6 +483,7 @@ epm_release_upgrade()
ALTLinux) ALTLinux)
__epm_ru_update || fatal __epm_ru_update || fatal
# TODO: remove this hack (or move it to distro_info)
# try to detect current release by repo # try to detect current release by repo
if [ "$DISTRVERSION" = "Sisyphus" ] || [ -z "$DISTRVERSION" ] ; then if [ "$DISTRVERSION" = "Sisyphus" ] || [ -z "$DISTRVERSION" ] ; then
local dv local dv
......
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