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

TODO

@@ -15,8 +15,6 @@ yum list extras – имена тех пакетов, которые налич
 
 --dump-options for write simple bash completition
 
-add epm site / epmurl in replace to rpmurl
-
 yum remove $(package-cleanup --orphans
 
 https://github.com/biow0lf/prometheus-cli
@@ -56,6 +54,7 @@ docmdmore
 apt-rpm/install
 apt-rpm/remove
 
+<<<<<<< HEAD
 при упаковке лучше собирать в один файл.
 
 <<<<<<< HEAD
@@ -65,5 +64,7 @@ apt-rpm/remove
 
 =======
 >>>>>>> master
+=======
+>>>>>>> heads/master
 serv должен уметь показывать порядок загрузки?
 >>>>>>> master

bin/epm-assure

@@ -108,7 +108,12 @@ __epm_assure()
     info "Installing appropriate package for $CMD command..."
     __epm_need_update $PACKAGE $PACKAGEVERSION || return 0
 
-    docmd epm --auto install $PACKAGE
+    docmd epm --auto install $PACKAGE || return
+
+    [ -n "$PACKAGEVERSION" ] || return 0
+    # check if we couldn't update and still need update
+    __epm_need_update $PACKAGE $PACKAGEVERSION && return 1
+    return 0
 }
 
 

bin/epm-release_upgrade

@@ -193,6 +193,7 @@ epm_release_upgrade()
 		info "Have no idea how to upgrade $DISTRNAME"
 		;;
 	*-dpkg)
+		assure_exists do-release-upgrade update-manager-core
 		sudocmd do-release-upgrade -d
 		;;
 	yum-rpm)

bin/epm-repofix

 #!/bin/sh
 #
-# Copyright (C) 2015  Etersoft
-# Copyright (C) 2015  Vitaly Lipatov <lav@etersoft.ru>
+# Copyright (C) 2015-2016  Etersoft
+# Copyright (C) 2015-2016  Vitaly Lipatov <lav@etersoft.ru>
 #
 # 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
@@ -17,6 +17,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
+load_helper epm-query
 
 __fix_apt_sources_list()
 {
@@ -34,7 +35,9 @@ __fix_apt_sources_list()
 		local br
 		for br in $DISTRVERSION ; do
 			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
 		regexp_subst "/ALTLinux\/Sisyphus\//s/^rpm *([fhr])/rpm [alt] \1/" $i
 	done

bin/epm-sh-functions

@@ -336,8 +336,10 @@ assure_exists()
 {
 	load_helper epm-assure
 	local package="$2"
+	local textpackage=
 	[ -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()

eepm.spec

 # This spec is backported to ALTLinux p7 automatically by rpmbph script from etersoft-build-utils.
 #
 Name: eepm
-Version: 1.7.5
+Version: 1.8.0
 Release: alt0.M70P.1
 
 Summary: Etersoft EPM package manager
@@ -67,9 +67,18 @@ chmod a+x %buildroot%_datadir/%name/{serv-,epm-}*
 %_sysconfdir/bash_completion.d/cerv
 
 %changelog
-* Sun Apr 24 2016 Vitaly Lipatov <lav@altlinux.ru> 1.7.5-alt0.M70P.1
+* Wed Apr 27 2016 Vitaly Lipatov <lav@altlinux.ru> 1.8.0-alt0.M70P.1
 - backport to ALTLinux p7 (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
+- fix assure_exists
+- epm-assure: improve version checking
+
 * Sun Apr 24 2016 Vitaly Lipatov <lav@altlinux.ru> 1.7.5-alt1
 - epm-print: add compare version command
 - repofix: fix Sisyphus replace

packed/serv.sh

@@ -328,8 +328,10 @@ assure_exists()
 {
 	load_helper epm-assure
 	local package="$2"
+	local textpackage=
 	[ -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()
@@ -1235,7 +1237,7 @@ $(get_help HELPOPT)
 
 print_version()
 {
-        echo "Service manager version 1.7.2"
+        echo "Service manager version 1.8.0"
         echo "Running on $($DISTRVENDOR)"
         echo "Copyright (c) Etersoft 2012, 2013, 2016"
         echo "This program may be freely redistributed under the terms of the GNU AGPLv3."