diff --git a/autodist b/autodist index 9453ff2..169551a 100755 --- a/autodist +++ b/autodist @@ -527,7 +527,7 @@ function launch_pkgs_loop() { JOB_ARGS="$JOB_ARGS$DEFINES_STRING" [ "$patch_operation" = "buildinstall" ] && patch_operation=build - [ "$patch_operation" = "autoupdate" ] && patch_operation=update + [ "$patch_operation" = "autoupdate" -o "$patch_operation" = "rebuild" ] && patch_operation=update # launch loop for each package for pkg in ${JOB_PKGS[*]}; do @@ -550,7 +550,7 @@ function launch_pkgs_loop() { rm -f ${LOGDIR}/failed/${LOGFILE_PKG_NAME}-${LOGFILE_SUFFIX} case $operation in - autoupdate|update|build|buildinstall) + autoupdate|update|build|rebuild|buildinstall) [ -e $spec_dir/$pkg.spec ] || { case $SEVERITY in 0) ;; @@ -986,7 +986,7 @@ if [ "$do_autobuild" = "1" ]; then if [ "${VERSION:0:1}" != "+" ]; then if [ $REBUILDOLDCOUNT -lt $AUTODIST_REBUILDOLD_MAX -a $BUILDDATE -ge $AUTODIST_REBUILDOLD_FROMDATE ]; then - # rebuilt 20 oldest packages (but newer than 20090101) + # rebuilt oldest packages REBUILDOLDCOUNT=$(($REBUILDOLDCOUNT + 1)) VERSION=+0 else @@ -1007,12 +1007,14 @@ if [ "$do_autobuild" = "1" ]; then fi fi - # check legacylist - awk '{ print $1 }' $LEGACYLIST | grep "^$PKGNAME$" >/dev/null && { - echo "?= Job $PKGNAME is in the legacy list; skipping automatic update" - echo "$PKGNAME $DATE_NOW 100" >> $SKIPPEDLISTDIR/auto.skip - continue - } + if [ "${VERSION:0:1}" != "+" ]; then + # check legacylist + awk '{ print $1 }' $LEGACYLIST | grep "^$PKGNAME$" >/dev/null && { + echo "?= Job $PKGNAME is in the legacy list; skipping automatic update" + echo "$PKGNAME $DATE_NOW 100" >> $SKIPPEDLISTDIR/auto.skip + continue + } + fi # manually or from lists scheduled jobs if [ "${VERSION:0:1}" == "+" -a "$VERSION" != "+0" ]; then diff --git a/autodist-cgi b/autodist-cgi index 98da897..901b1f5 100755 --- a/autodist-cgi +++ b/autodist-cgi @@ -102,6 +102,8 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do LOGDIR=`environment_logdir $i` AUTOPORTLOGDIR=`environment_autoport_logdir $i` + ENVROOTDIR=`environment_rootdir $i` + if [ "${AUTOPORT_UPDATE[$i]}" ]; then LOGFILE="$LOGDIR/autodist.log" LASTLOGFILE="$LOGDIR/autodist-last.log" @@ -125,7 +127,7 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do fi if [ "$SHOWLOG" ]; then if [ "$HOST" = "$AS_HOST" -a "$NUM" = "$i" ]; then - echo -n "
Generated by autodist CGI interface. Last update: `date`"
+ echo "
Generated by autodist CGI interface. Last update: `date`"
if [ "$FORMAT" = "xml" ]; then
echo -n "]]>"
[ "$RELOADTIME" ] && echo -n "