fix repofix code

bin/epm-repofix

@@ -18,15 +18,18 @@
 #
 
 # FIXME
-SUBST_ALT_RULE='s!^([^#].*)[/ ](ALTLinux|LINUX\@Etersoft)[/ ](Sisyphus|p7[/ ]branch|p6[/ ]branch)[/ ](x86_64|i586|x86_64-i586|noarch) !\1 \2/\3/\4 !gi'
+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()
 {
-	[ -n "$SUDO" ] && fatal "run only under root"
+	local i
+	assure_root
 	for i in "$@" ; do
 		[ -s "$i" ] || continue
 		#perl -i.bak -pe "$SUBST_ALT_RULE" $i
-		sed -i -e -r "$SUBST_ALT_RULE" $i
+		# TODO: only for uncommented strings
+		#sed -i -r -e "$SUBST_ALT_RULE" $i
+		regexp_subst "/^ *#/! $SUBST_ALT_RULE" $i
 	done
 }