![\"running...\"](\"/images/inprogress.gif\" "\\"running...\\""){kind=small}
"
+ else
+ if [ $RETCODE -eq 0 ]; then
+# echo -n "OK"
+ echo -n "![\"OK\"](\"/images/ok.png\" "\\"Job"){kind=small}
"
+ else
+# echo -n "ERROR ($RETCODE)"
+ echo -n "![\"ERROR\"](\"/images/fail.png\" "\\"Job"){kind=small}
"
+ fi
+ fi
echo -n "$2 on `print_environment_descr $3`: "
if [ $RETCODE -eq 256 -a -e /proc/$1 ]; then
echo -n "\""
echo -n "$cmdline\" "
- echo -n "(running...)"
else
echo -n "\""
@@ -341,11 +351,6 @@ if [ "$REQUEST" = "refresh" -o "$REQUEST" = "refreshjobs" ]; then
$SUDO_WRAPPER finishprocess $1 "$USER" $5
RETCODE=$?
fi
- if [ $RETCODE -eq 0 ]; then
- echo -n "OK"
- else
- echo -n "ERROR ($RETCODE)"
- fi
fi
if [ "$2" = "$USER" -o "$USER_ADMIN" ]; then
if [ $RETCODE -eq 256 -a -e /proc/$1 ]; then
@@ -531,7 +536,7 @@ elif [ ! "$REQUEST" -o "$REQUEST" = "changeenvironment" -o "$REQUEST" = "switchm
# SPECFILES select
echo -n "HINT: does summary look short and good?
${SPECVAR_Name[0]} - ${SPECVAR_Summary[0]}."`\"" echo -n "); class=redbutton $HREFADD>" # recreate and send SRPM if [ "$SPECVAR_CHECK_NOAUTOBUILDREQ" ]; then @@ -1427,12 +1435,18 @@ case $REQUEST in RET=$? [ $RET -eq 0 ] && social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"sent $AUTODISTPKGS to $SENDREPOSITORY\" STIME=`date +%s`" ;; - "autoport") $SUDO_WRAPPER background $ENVIRONMENT "$USER" $PACKAGE "autoport $PACKAGE -r $REPOSITORY" &>/dev/null - [ $? -ne 0 ] && RET=$? || { + "autoport") if [ "$AUTOPORTPACKAGE" ]; then + $SUDO_WRAPPER background $ENVIRONMENT "$USER" $AUTOPORTPACKAGE "autoport $AUTOPORTPACKAGE -r $REPOSITORY" &>/dev/null + RET=$? + [ $REQ -eq 0 ] && { RET=-1 echo "Autoport started. You may see the output in the Webbuild jobs box above." } - ;; + else + echo "ERROR: no port package specified!" + RET=1 + fi + ;; "autospecupdatescheck") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "$AUTOSPEC_CMD -u $PACKAGE -a2"; RET=$? ;; "rpmprepare") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "rpmbuild -bp $PACKAGE.spec --nodeps"; RET=$? ;; "rpmbuild") [ "$RPMFORCE" = "true" ] && RPMFORCEADD="--force-build" @@ -1634,7 +1648,7 @@ case $REQUEST in echo "ERROR: BUILDROOT is undefined" RET=1 else - $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cd $SPECVAR_RPMBUILDROOT && find $SPECVAR_BUILDROOT" + $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cd $SPECVAR_RPMBUILDROOT/$SPECVAR_BUILDROOT && find" RET=$? fi ;; @@ -1661,7 +1675,7 @@ case $REQUEST in echo -n "" done ;; - "configurehelp") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cd $SPECVAR_RPMBUILDDIR/$SPECVAR_BUILDDIR && ./configure --help" + "configurehelp") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cd $SPECVAR_RPMBUILDDIR/$SPECVAR_BUILDDIR && ./configure --help || ./waf configure --help" RET=$? [ $RET -eq 0 ] && RET=-1 ;; "configurelog") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cd $SPECVAR_RPMBUILDDIR/$SPECVAR_BUILDDIR && cat config.log" @@ -1848,7 +1862,7 @@ if [ "$MAINTAINERMODE" = "true" ]; then else [ "$PACKAGE" ] && echo -n "$PACKAGE $SPECVAR_Version-$SPECVAR_Release " || echo -n "no package " echo -n "(" - print_environment_descr + print_environment_descr $ENVIRONMENT echo -n ")" fi diff --git a/webbuild/webbuild-functions b/webbuild/webbuild-functions index 258cf45..6f5ad2d 100644 --- a/webbuild/webbuild-functions +++ b/webbuild/webbuild-functions @@ -210,7 +210,7 @@ function parse_build_output() { s|^\([\+#] .*\)|\1|; s|\(ftp[s]*://[[:alnum:]+\,:&?/_.=~%#-]*\)|\1|; s|\(http[s]*://[[:alnum:]+\,:&?/_.=~%#-]*\)|\1|; - s|\(.*error[^0-9A-Za-z]*:[[:space:]]*\)\(.*\)|\1\2|i; + s|\(.*\)\(error[^0-9A-Za-z]*:[[:space:]]*.*\)|\1\2|i; s|^\(== =.*\)|\1|; s|^[[:cntrl:]]*\([!%?=][!%!=>] .*\)|\1|; s|[[:cntrl:]]||g;" | google_search $1 @@ -260,3 +260,29 @@ function print_environment_descr() { echo -n " for ${AUTOPORT_ARCH[$i]}" # (${AUTOPORT_BASE_REPOSITORY[$i]} based)" } + +function environment_autoport_logdir() { + local env=$1 + if [ "${AUTOPORT_CHROOT[$env]}" ]; then + echo "/var/autoport/${AUTOPORT_CHROOT[$env]}/home/${AUTOPORT_CHROOT_USER[$env]}/.autoport/" + elif [ "${AUTOPORT_NATIVE[$env]}" ]; then + local envhome=`eval echo ~${AUTOPORT_CHROOT_USER[$env]}` + echo "$envhome/.autoport" + fi +} + +function environment_logdir() { + local env=$1 + if [ "${AUTOPORT_CHROOT[$env]}" ]; then + echo "/var/autoport/${AUTOPORT_CHROOT[$env]}/home/${AUTOPORT_CHROOT_USER[$env]}/.autodist/log/" + elif [ "${AUTOPORT_NATIVE[$env]}" ]; then + local envhome=`eval echo ~${AUTOPORT_CHROOT_USER[$env]}` + if [ "${AUTOPORT_CHROOT_USER[$env]}" = "autodist" ]; then + echo "$envhome/log" + else + echo "$envhome/.autodist/log/" + fi + else + echo "/var/autodist/log/" + fi +} diff --git a/webbuild/webbuild-functions-private b/webbuild/webbuild-functions-private index fd7e34b..7b5bc70 100644 --- a/webbuild/webbuild-functions-private +++ b/webbuild/webbuild-functions-private @@ -23,17 +23,12 @@ function showlog() { LOGFILE3=$LOGFILE/*_${PACKAGE/\//_}__*.${AUTOPORT_ARCH[$ENVIRONMENT]} LOGFILE4=$LOGFILE/*_${PACKAGE/\//_}.${AUTOPORT_ARCH[$ENVIRONMENT]} - if [ "${AUTOPORT_CHROOT[$ENVIRONMENT]}" ]; then - LOGDIR="/var/autoport/${AUTOPORT_CHROOT[$ENVIRONMENT]}/home/${AUTOPORT_CHROOT_USER[$ENVIRONMENT]}/.autodist/log/" - elif [ "${AUTOPORT_NATIVE[$ENVIRONMENT]}" ]; then - LOGDIR="/home/${AUTOPORT_CHROOT_USER[$ENVIRONMENT]}/.autodist/log/" - else - LOGDIR="/var/autodist/log/" - fi + LOGDIR=`environment_logdir $ENVIRONMENT` LOGFILES="$LOGDIR/$LOGFILE1 $LOGDIR/$LOGFILE2 $LOGDIR/$LOGFILE3 $LOGDIR/$LOGFILE4" for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do [ "$i" = "$ENVIRONMENT" ] && continue + [ "${AUTOPORT_ARCH[$i]}" = "${AUTOPORT_ARCH[$ENVIRONMENT]}" ] || continue if [ "${AUTOPORT_UPDATE[$i]}" ]; then LOGDIR="/var/autodist/log" LOGFILES="$LOGFILES $LOGDIR/$LOGFILE1 $LOGDIR/$LOGFILE2 $LOGDIR/$LOGFILE3 $LOGDIR/$LOGFILE4"