From 13e52f18d5b59e9ea6c8e1ea0a3f06b2eca73684 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 7 Jun 2014 19:13:48 +0200 Subject: [PATCH] 60-autodist-update cron: add AUTOPORT_UPDATE_NO_AUTOMAINT and AUTOPORT_UPDATE_NO_DISTROMATIC configuration settings These variables are set to 1 by default --- etc/cron.hourly/60-autodist-update | 10 +++++++--- etc/sysconfig/autoport | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/etc/cron.hourly/60-autodist-update b/etc/cron.hourly/60-autodist-update index afe0c95..bc00053 100755 --- a/etc/cron.hourly/60-autodist-update +++ b/etc/cron.hourly/60-autodist-update @@ -9,7 +9,9 @@ ME=`basename $0` # FIXME: parametrize automaint call -automaint -s devel-autodist -d devel -p devel-makedist +if [ ! "$AUTOPORT_UPDATE_NO_AUTOMAINT" ]; then + automaint -s devel-autodist -d devel -p devel-makedist +fi [ "$$" == "`pidof -x $ME`" -o "$$" == "`pidof -x 60-autodist-update`" ] || { # echo "Warning: $ME script already running; exiting." @@ -51,8 +53,10 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do REPLASTLOGFILE=$LOCAL_REPS_BASE_DIR/$r/autodist-last.log if [ "${AUTOPORT_UPDATE[$i]}" ]; then - pid_check - distromatic -q -t $DISTROMATIC_REPOSITORY --gensrcpkglist > $LOCAL_REPS_BASE_DIR/$DISTROMATIC_REPOSITORY/srcpkglist 2>/dev/null + if [ ! "$AUTOPORT_UPDATE_NO_DISTROMATIC" ]; then + pid_check + distromatic -q -t $DISTROMATIC_REPOSITORY --gensrcpkglist > $LOCAL_REPS_BASE_DIR/$DISTROMATIC_REPOSITORY/srcpkglist 2>/dev/null + fi pid_check autodist-upstream-updates -q -h -u -r $DISTROMATIC_REPOSITORY -o $r \ diff --git a/etc/sysconfig/autoport b/etc/sysconfig/autoport index cb9508a..8f43e35 100644 --- a/etc/sysconfig/autoport +++ b/etc/sysconfig/autoport @@ -5,6 +5,9 @@ local_ftp=/var/ftp/pub/openmamba/ #AUTOBUILDS_STATUS_URL="http://www.openmamba.org/distribution/autobuilds.html" #AUTOPORT_ENABLE=1 +# Disabled by default because they would require local repository +AUTOPORT_UPDATE_NO_AUTOMAINT=1 +AUTOPORT_UPDATE_NO_DISTROMATIC=1 #AUTOPORT_CGI_HOST=(http://localhost/cgi-bin/autodist) #AUTOPORT_WEBBUILD_HOST=http://localhost/webbuild.html #ICECREAM_MONITOR_HOST=localhost