Skip to content

E
eepm
Commit 1b84fc01 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

epm-release_upgrade: don't touch apt-conf and alt-release during update to p10

parent 1f1330ce
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
bin/epm-release_upgrade
View file @ 1b84fc01
...@@ -145,8 +145,10 @@ get_fix_release_pkg() ...@@ -145,8 +145,10 @@ get_fix_release_pkg()
if [ "$TO" = "Sisyphus" ] ; then if [ "$TO" = "Sisyphus" ] ; then
TO="sisyphus" TO="sisyphus"
echo "apt-conf-$TO" echo "apt-conf-$TO"
elif [ "$TO" = "p10" ] ; then
true
#echo "apt-conf-$TO"
else else
# will it update /etc/altlinux-release
echo "apt-conf-branch" echo "apt-conf-branch"
fi fi
...@@ -335,7 +337,7 @@ __switch_alt_to_distro() ...@@ -335,7 +337,7 @@ __switch_alt_to_distro()
echo '%_priority_distbranch p10' >/etc/rpm/macros.d/p10 echo '%_priority_distbranch p10' >/etc/rpm/macros.d/p10
__epm_ru_update || fatal __epm_ru_update || fatal
docmd epm upgrade || fatal "Check an error and run epm release-upgrade again" docmd epm upgrade || fatal "Check an error and run epm release-upgrade again"
docmd epm install rpm apt "$(get_fix_release_pkg --force "$TO")" || fatal "Check an error and run epm release-upgrade again" docmd epm install rpm apt "$(get_fix_release_pkg "$TO")" || fatal "Check an error and run epm release-upgrade again"
__check_system __check_system
docmd epm update-kernel -t std-def || fatal docmd epm update-kernel -t std-def || fatal
;; ;;
......
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