Commit 432b12e3 authored by Vitaly Lipatov's avatar Vitaly Lipatov

backported to p8 as 1.8.0-alt0.M80P.1 (with rpmbph script)

parents a84e6de1 df434217
...@@ -193,6 +193,7 @@ epm_release_upgrade() ...@@ -193,6 +193,7 @@ epm_release_upgrade()
info "Have no idea how to upgrade $DISTRNAME" info "Have no idea how to upgrade $DISTRNAME"
;; ;;
*-dpkg) *-dpkg)
assure_exists do-release-upgrade update-manager-core
sudocmd do-release-upgrade -d sudocmd do-release-upgrade -d
;; ;;
yum-rpm) yum-rpm)
......
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2015 Etersoft # Copyright (C) 2015-2016 Etersoft
# Copyright (C) 2015 Vitaly Lipatov <lav@etersoft.ru> # Copyright (C) 2015-2016 Vitaly Lipatov <lav@etersoft.ru>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by # it under the terms of the GNU Affero General Public License as published by
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
# 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
__fix_apt_sources_list() __fix_apt_sources_list()
{ {
...@@ -34,7 +35,9 @@ __fix_apt_sources_list() ...@@ -34,7 +35,9 @@ __fix_apt_sources_list()
local br local br
for br in $DISTRVERSION ; do for br in $DISTRVERSION ; do
regexp_subst "/ALTLinux\/$br\/branch/s/^rpm *([fhr])/rpm [$br] \1/" $i regexp_subst "/ALTLinux\/$br\/branch/s/^rpm *([fhr])/rpm [$br] \1/" $i
regexp_subst "/Etersoft\/$br\/branch/s/^rpm *([fhr])/rpm [etersoft] \1/" $i if is_installed apt-conf-etersoft-common ; then
regexp_subst "/Etersoft\/$br\/branch/s/^rpm *([fhr])/rpm [etersoft] \1/" $i
fi
done done
regexp_subst "/ALTLinux\/Sisyphus\//s/^rpm *([fhr])/rpm [alt] \1/" $i regexp_subst "/ALTLinux\/Sisyphus\//s/^rpm *([fhr])/rpm [alt] \1/" $i
done done
......
# This spec is backported to ALTLinux p8 automatically by rpmbph script from etersoft-build-utils. # This spec is backported to ALTLinux p8 automatically by rpmbph script from etersoft-build-utils.
# #
Name: eepm Name: eepm
Version: 1.7.6 Version: 1.8.0
Release: alt0.M80P.1 Release: alt0.M80P.1
Summary: Etersoft EPM package manager Summary: Etersoft EPM package manager
...@@ -67,9 +67,14 @@ chmod a+x %buildroot%_datadir/%name/{serv-,epm-}* ...@@ -67,9 +67,14 @@ chmod a+x %buildroot%_datadir/%name/{serv-,epm-}*
%_sysconfdir/bash_completion.d/cerv %_sysconfdir/bash_completion.d/cerv
%changelog %changelog
* Sun Apr 24 2016 Vitaly Lipatov <lav@altlinux.ru> 1.7.6-alt0.M80P.1 * Wed Apr 27 2016 Vitaly Lipatov <lav@altlinux.ru> 1.8.0-alt0.M80P.1
- backport to ALTLinux p8 (by rpmbph script) - backport to ALTLinux p8 (by rpmbph script)
* Wed Apr 27 2016 Vitaly Lipatov <lav@altlinux.ru> 1.8.0-alt1
- commit packed files
- repofix: replace Etersoft branches only if have Etersoft key
- release_upgrade: install update-manager-core package for deb-based
* Sun Apr 24 2016 Vitaly Lipatov <lav@altlinux.ru> 1.7.6-alt1 * Sun Apr 24 2016 Vitaly Lipatov <lav@altlinux.ru> 1.7.6-alt1
- fix assure_exists - fix assure_exists
- epm-assure: improve version checking - epm-assure: improve version checking
......
...@@ -328,8 +328,10 @@ assure_exists() ...@@ -328,8 +328,10 @@ assure_exists()
{ {
load_helper epm-assure load_helper epm-assure
local package="$2" local package="$2"
local textpackage=
[ -n "$package" ] || package="$(__get_package_for_command "$1")" [ -n "$package" ] || package="$(__get_package_for_command "$1")"
__epm_assure "$1" $package || fatal "Can't assure in '$1' command" [ -n "$3" ] && textpackage=" >= $3"
__epm_assure "$1" $package $3 || fatal "Can't assure in '$1' command from $package$textpackage package"
} }
eget() eget()
...@@ -1235,7 +1237,7 @@ $(get_help HELPOPT) ...@@ -1235,7 +1237,7 @@ $(get_help HELPOPT)
print_version() print_version()
{ {
echo "Service manager version 1.7.2" echo "Service manager version 1.8.0"
echo "Running on $($DISTRVENDOR)" echo "Running on $($DISTRVENDOR)"
echo "Copyright (c) Etersoft 2012, 2013, 2016" echo "Copyright (c) Etersoft 2012, 2013, 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."
......
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