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

bin/epm-Install

@@ -33,7 +33,7 @@ epm_Install()
 		yum-rpm)
 			;;
 		*)
-			epm_update || return
+			pkg_filenames= epm_update || return
 			;;
 	esac
 

bin/epm-Upgrade

@@ -26,7 +26,7 @@ epm_Upgrade()
 		yum-rpm)
 			;;
 		*)
-			epm_update || return
+			pkg_filenames= epm_update || return
 			;;
 	esac
 

bin/epm-release_upgrade

@@ -33,7 +33,7 @@ __replace_alt_version_in_repo()
 		regexp_subst "/^ *#/! s!$1/branch!$2/branch!g" $i
 		
 		# TODO: start with improve to [p8] - install some package firstly?
-		regexp_subst "/^ *#/! s!\[$1\]![alt]/branch!g" $i
+		regexp_subst "/^ *#/! s!\[$1\]![\$2]!g" $i
 	done
 	docmd apt-repo list
 }
@@ -42,6 +42,7 @@ __update_alt_repo_to_next_distro()
 {
 	case "$DISTRVERSION" in
 		p6)
+			docmd epm install apt-conf-branch || fatal
 			__replace_alt_version_in_repo p6 p7
 			docmd epm update
 			docmd epm install apt rpm || fatal
@@ -50,6 +51,7 @@ __update_alt_repo_to_next_distro()
 			info "Run epm release-upgrade again for update to p8"
 			;;
 		p7)
+			docmd epm install apt-conf-branch || fatal
 			__replace_alt_version_in_repo p7 p8
 			docmd epm update
 			docmd epm install apt rpm || fatal

bin/epm-repofix

@@ -20,7 +20,7 @@
 
 __fix_apt_sources_list()
 {
-	local SUBST_ALT_RULE='s!^([^#].*)[/ ](ALTLinux|LINUX\@Etersoft)[/ ](Sisyphus|p8[/ ]branch|p7[/ ]branch|p6[/ ]branch)[/ ](x86_64|i586|x86_64-i586|noarch) !\1 \2/\3/\4 !gi'
+	local SUBST_ALT_RULE='s!^(.*)[/ ](ALTLinux|LINUX\@Etersoft)[/ ](Sisyphus|p8[/ ]branch|p7[/ ]branch|p6[/ ]branch)[/ ](x86_64|i586|x86_64-i586|noarch) !\1 \2/\3/\4 !gi'
 	local i
 	assure_root
 	for i in "$@" ; do
@@ -29,6 +29,12 @@ __fix_apt_sources_list()
 		# TODO: only for uncommented strings
 		#sed -i -r -e "$SUBST_ALT_RULE" $i
 		regexp_subst "/^ *#/! $SUBST_ALT_RULE" $i
+		local br
+		for br in p6 p7 p8 ; do
+			# sed -r -e "/ALTLinux\/p8\/branch/s/rpm *([fhr])/rpm [p8] \1/"
+			regexp_subst "/ALTLinux\/$br\/branch/s/^rpm *([fhr])/rpm [$br] \1/" $i
+			regexp_subst "/Etersoft\/$br\/branch/s/^rpm *([fhr])/rpm [etersoft] \1/" $i
+		done
 	done
 }
 

eepm.spec

 # This spec is backported to ALTLinux p7 automatically by rpmbph script from etersoft-build-utils.
 #
 Name: eepm
-Version: 1.6.6
+Version: 1.6.7
 Release: alt0.M70P.1
 
 Summary: Etersoft EPM package manager
@@ -67,9 +67,15 @@ chmod a+x %buildroot%_datadir/%name/{serv-,epm-}*
 %_sysconfdir/bash_completion.d/cerv
 
 %changelog
-* Fri Apr 15 2016 Vitaly Lipatov <lav@altlinux.ru> 1.6.6-alt0.M70P.1
+* Fri Apr 15 2016 Vitaly Lipatov <lav@altlinux.ru> 1.6.7-alt0.M70P.1
 - backport to ALTLinux p7 (by rpmbph script)
 
+* Fri Apr 15 2016 Vitaly Lipatov <lav@altlinux.ru> 1.6.7-alt1
+- release_upgrade: fix sign replacement
+- fix epm_update
+- set p8 sign and install apt-conf-branch
+- repofix: add signs for ALT Linux or Etersoft branches
+
 * Fri Apr 15 2016 Vitaly Lipatov <lav@altlinux.ru> 1.6.6-alt1
 - release_upgrade: improve upgrade way
 - epm: update copyright date