Skip to content

E
eepm
Commit 0c7f8263 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

small fixes

parent f8d71ddc
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
bin/epm-release_upgrade
View file @ 0c7f8263
...@@ -31,7 +31,7 @@ __replace_alt_version_in_repo() ...@@ -31,7 +31,7 @@ __replace_alt_version_in_repo()
regexp_subst "/^ *#/! s!$1/branch!$2/branch!g" $i regexp_subst "/^ *#/! s!$1/branch!$2/branch!g" $i
# TODO: start with improve to [p8] - install some package firstly? # 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 done
docmd apt-repo list docmd apt-repo list
} }
...@@ -62,6 +62,7 @@ epm_release_upgrade() ...@@ -62,6 +62,7 @@ epm_release_upgrade()
ALTLinux) ALTLinux)
docmd epm update docmd epm update
docmd epm install apt rpm docmd epm install apt rpm
load_helper epm-repofix
pkg_filenames= epm_repofix pkg_filenames= epm_repofix
__update_alt_repo_to_next_distro || exit __update_alt_repo_to_next_distro || exit
docmd epm Upgrade docmd epm Upgrade
......
bin/epm-repofix
View file @ 0c7f8263
...@@ -17,11 +17,10 @@ ...@@ -17,11 +17,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # 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() __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 local i
assure_root assure_root
for i in "$@" ; do for i in "$@" ; do
......
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