Commit 5e1e0504 authored by Vitaly Lipatov's avatar Vitaly Lipatov

improve p10 support

parent 662ce53a
/*
* This is the main configuration file for the APT suite of tools,
* see apt.conf(5) for details.
*/
Dir::Etc::main "/dev/null";
Dir::Etc::parts "/var/empty";
Dir::Etc::SourceParts "/var/empty";
Dir::Etc::sourcelist "/etc/eterbuild/apt/sources.list.p10";
# Package repository URLs
#
# You can add [alt] after rpm for digital signature check
rpm file:/var/ftp/ pub/ALTLinux/p10/branch/i586 classic
rpm file:/var/ftp/ pub/ALTLinux/p10/branch/noarch classic
rpm file:/var/ftp/ pub/ALTLinux/p10/branch/x86_64-i586 classic
rpm [etersoft] file:/var/ftp/ pub/Etersoft/LINUX@Etersoft/p10/branch/i586 addon
rpm [etersoft] file:/var/ftp/ pub/Etersoft/LINUX@Etersoft/p10/branch/noarch addon
rpm [etersoft] file:/var/ftp/ pub/Etersoft/LINUX@Etersoft/p10/branch/x86_64-i586 addon
...@@ -37,6 +37,12 @@ get_type_by_git_branch_name() ...@@ -37,6 +37,12 @@ get_type_by_git_branch_name()
return return
fi fi
# like p10
if echo $1 | egrep -q "^[ptc]1[0-9].?$" ; then
get_altdistr_mod $1
return
fi
# like cert6 # like cert6
if echo $1 | egrep -q "^cert[0-9].?$" ; then if echo $1 | egrep -q "^cert[0-9].?$" ; then
get_altdistr_mod $1 get_altdistr_mod $1
......
...@@ -12,9 +12,9 @@ set_usebranch() ...@@ -12,9 +12,9 @@ set_usebranch()
USEBRANCH=$BINARYREPO USEBRANCH=$BINARYREPO
[ -n "$USEBRANCH" ] || return 1 [ -n "$USEBRANCH" ] || return 1
[ "$USEBRANCH" = "sisyphus" ] && return 1 [ "$USEBRANCH" = "$(get_altdistr_mod "$DISTRVERSION")" ] && return 1
# TODO: drop support of it # TODO: drop support of the legacy
# support for obsoleted M?? names # support for obsoleted M?? names
OLDBRANCH=$MDISTR OLDBRANCH=$MDISTR
......
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