webbuild: support for getting repository list from configuration

This commit is contained in:
Silvan Calarco 2013-05-22 12:09:19 +02:00
parent 0315d1a69d
commit dd369356c5
3 changed files with 18 additions and 2 deletions

View File

@ -9,6 +9,14 @@ GNOME_VER=3.4
#WEBBUILD_EMAIL=
#WEBBUILD_SECRET=
WEBBUILD_STATEDIR=/var/webbuild
WEBBUILD_REPOSITORIES=(devel devel-games devel-kernel devel-kde4 devel-xorg devel-gnome devel-makedist \
devel-java devel-misc devel-autodist devel-future devel-past \
milestone1 milestone1-updates milestone1-games milestone1-1.1 milestone1-makedist \
milestone2 milestone2-games milestone2-updates milestone2-kernel milestone2-kde4 \
milestone2-xorg milestone2-makedist milestone2-java \
devel-contrib devel-silvan devel-stefano devel-aleph0 devel-skiver devel-fabiog devel-gil \
devel-distservers devel-the_packagizers devel-ercolinux \
devel-contrib-java devel-michiamophil milestone1-java milestone1-contrib)
AUTOBUILD_MAXNUM=200
AUTOBUILD_DATEFROM=20060601
AUTOBUILD_SKIP_DAYS=28

View File

@ -606,7 +606,7 @@ if [ ! "${AUTOPORT_UPDATE[$ENVIRONMENT]}" -o "$MAINTAINERMODE" = "true" ]; then
fi
echo -n "&REQUEST=changerepository\");>"
echo -n "<option value=\"\">-- Select a repository --</option>"
for f in `$SUDO_WRAPPER 0 local "$USER" "" "/usr/sbin/openmamba-repository list"`; do
for f in `repository_list`; do
repname=`basename $f`
[ "$repname" = "$REPOSITORY" ] && SELECTED="selected=selected" || SELECTED=
if [ "$MAINTAINERMODE" = "true" -a ! "$USER_ALLREPOSITORIES" ]; then
@ -1009,7 +1009,7 @@ if [ "$MAINTAINERMODE" != "true" ]; then
echo -n "<br>Send to:"
echo -n "<select id=sendrepository>"
if [ "$USER_ALLREPOSITORIES" ]; then
SEND_REPS=`$SUDO_WRAPPER 0 local "$USER" "" "/usr/sbin/openmamba-repository list"`
SEND_REPS=`repository_list`
elif [ "$USER_CANMAINTAIN_REPOSITORIES" ]; then
SEND_REPS="$USER_CANMAINTAIN_REPOSITORIES";
for u in $USER_CANMAINTAIN_REPOSITORIES devel-$USER; do

View File

@ -1,3 +1,11 @@
repository_list() {
if [ "$WEBBUILD_REPOSITORIES" ]; then
echo "${WEBBUILD_REPOSITORIES[*]}"
else
$SUDO_WRAPPER 0 local "$USER" "" "/usr/sbin/openmamba-repository list"
fi
}
function showlog() {
local LOGDIR LOGFILES LOGFILE1 LOGFILE2 LOGFILE3 LOGFILE4