Commit 050980c1 authored by Vitaly Lipatov's avatar Vitaly Lipatov

backported to p7 as 1.6.6-alt0.M70P.1 (with rpmbph script)

parents 5923058a 0fa877e2
...@@ -60,7 +60,7 @@ print_version() ...@@ -60,7 +60,7 @@ print_version()
{ {
echo "EPM package manager version @VERSION@" echo "EPM package manager version @VERSION@"
echo "Running on $($DISTRVENDOR) ('$PMTYPE' package manager uses '$PKGFORMAT' package format)" echo "Running on $($DISTRVENDOR) ('$PMTYPE' package manager uses '$PKGFORMAT' package format)"
echo "Copyright (c) Etersoft 2012-2015" echo "Copyright (c) Etersoft 2012-2016"
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."
} }
......
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
load_helper epm-query
__replace_alt_version_in_repo() __replace_alt_version_in_repo()
{ {
local i local i
...@@ -41,10 +43,22 @@ __update_alt_repo_to_next_distro() ...@@ -41,10 +43,22 @@ __update_alt_repo_to_next_distro()
case "$DISTRVERSION" in case "$DISTRVERSION" in
p6) p6)
__replace_alt_version_in_repo p6 p7 __replace_alt_version_in_repo p6 p7
docmd epm update
docmd epm install apt rpm || fatal
docmd epm upgrade
docmd epm update-kernel
info "Run epm release-upgrade again for update to p8" info "Run epm release-upgrade again for update to p8"
;; ;;
p7) p7)
__replace_alt_version_in_repo p7 p8 __replace_alt_version_in_repo p7 p8
docmd epm update
docmd epm install apt rpm || fatal
if is_installed systemd ; then
docmd epm install systemd || fatal
fi
docmd epm upgrade || fatal
#info " # epmi branding-simply-linux-release branding-simply-linux-graphics"
docmd epm update-kernel
;; ;;
*) *)
info "Have no idea how to update from $DISTRNAME $DISTRVERSION" info "Have no idea how to update from $DISTRNAME $DISTRVERSION"
...@@ -64,9 +78,7 @@ epm_release_upgrade() ...@@ -64,9 +78,7 @@ epm_release_upgrade()
docmd epm install apt rpm docmd epm install apt rpm
load_helper epm-repofix load_helper epm-repofix
pkg_filenames= epm_repofix pkg_filenames= epm_repofix
__update_alt_repo_to_next_distro || exit __update_alt_repo_to_next_distro
docmd epm Upgrade
docmd epm update-kernel
return return
;; ;;
*) *)
......
# This spec is backported to ALTLinux p7 automatically by rpmbph script from etersoft-build-utils. # This spec is backported to ALTLinux p7 automatically by rpmbph script from etersoft-build-utils.
# #
Name: eepm Name: eepm
Version: 1.6.5 Version: 1.6.6
Release: alt0.M70P.1 Release: alt0.M70P.1
Summary: Etersoft EPM package manager Summary: Etersoft EPM package manager
...@@ -67,9 +67,13 @@ chmod a+x %buildroot%_datadir/%name/{serv-,epm-}* ...@@ -67,9 +67,13 @@ chmod a+x %buildroot%_datadir/%name/{serv-,epm-}*
%_sysconfdir/bash_completion.d/cerv %_sysconfdir/bash_completion.d/cerv
%changelog %changelog
* Fri Apr 15 2016 Vitaly Lipatov <lav@altlinux.ru> 1.6.5-alt0.M70P.1 * Fri Apr 15 2016 Vitaly Lipatov <lav@altlinux.ru> 1.6.6-alt0.M70P.1
- backport to ALTLinux p7 (by rpmbph script) - backport to ALTLinux p7 (by rpmbph script)
* Fri Apr 15 2016 Vitaly Lipatov <lav@altlinux.ru> 1.6.6-alt1
- release_upgrade: improve upgrade way
- epm: update copyright date
* Fri Apr 15 2016 Vitaly Lipatov <lav@altlinux.ru> 1.6.5-alt1 * Fri Apr 15 2016 Vitaly Lipatov <lav@altlinux.ru> 1.6.5-alt1
- restrict sudo args - restrict sudo args
- small fixes - small fixes
......
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