small fixes

bin/epm-release_upgrade

@@ -31,7 +31,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 s!\[$1\]![alt]/branch!g" $i
+		regexp_subst "/^ *#/! s!\[$1\]![alt]/branch!g" $i
 	done
 	docmd apt-repo list
 }
@@ -62,6 +62,7 @@ epm_release_upgrade()
 	ALTLinux)
 		docmd epm update
 		docmd epm install apt rpm
+		load_helper epm-repofix
 		pkg_filenames= epm_repofix
 		__update_alt_repo_to_next_distro || exit
 		docmd epm Upgrade

bin/epm-repofix

@@ -17,11 +17,10 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-# FIXME
-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'
 
 __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 i
 	assure_root
 	for i in "$@" ; do