From 40e4af994797580b62f720d807bb70fc7f4587d1 Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Wed, 23 Dec 2015 14:37:44 +0100 Subject: [PATCH] Get rid of lots of repetitions calling stage Instead we now have a simple text list, 5 columns and a simple while read loop transforming that to the right $thingtodo. --- config/debian/cron.dinstall | 428 ++++++++----------------------- config/debian/dinstall.functions | 11 + 2 files changed, 112 insertions(+), 327 deletions(-) diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall index 07e9b0d5..c17d7a5c 100755 --- a/config/debian/cron.dinstall +++ b/config/debian/cron.dinstall @@ -170,333 +170,107 @@ trap remove_daily_lock EXIT TERM HUP INT QUIT touch "${LOCK_BRITNEY}" -GO=( - FUNC="savetimestamp" - TIME="" - ARGS="" - ERR="false" -) -stage $GO - -GO=( - FUNC="qa1" - TIME="init" - ARGS="" - ERR="false" -) -stage $GO & - -GO=( - FUNC="pg_timestamp" - TIME="pg_dump1" - ARGS="predinstall" - ERR="" -) -stage $GO - -GO=( - FUNC="updates" - TIME="External Updates" - ARGS="" - ERR="false" -) -stage $GO - -GO=( - FUNC="i18n1" - TIME="i18n 1" - ARGS="" - ERR="false" -) -stage $GO - -GO=( - FUNC="dep11" - TIME="dep11 1" - ARGS="" - ERR="false" -) -stage $GO - -lockfile "$LOCK_ACCEPTED" -trap remove_all_locks EXIT TERM HUP INT QUIT - -GO=( - FUNC="punew" - TIME="p-u-new" - ARGS="stable-new" - ERR="false" -) -stage $GO - -GO=( - FUNC="opunew" - TIME="o-p-u-new" - ARGS="oldstable-new" - ERR="false" -) -stage $GO - -GO=( - FUNC="backports_policy" - TIME="backports-policy" - ARGS="" - ERR="false" -) -stage $GO - -GO=( - FUNC="cruft" - TIME="cruft" - ARGS="" - ERR="" -) -stage $GO - -state "indices" - -GO=( - FUNC="dominate" - TIME="dominate" - ARGS="" - ERR="" -) -stage $GO - -GO=( - FUNC="autocruft" - TIME="autocruft" - ARGS="unstable experimental" - ERR="" -) -stage $GO - -GO=( - FUNC="fingerprints" - TIME="import-keyring" - ARGS="" - ERR="false" -) -stage $GO - -GO=( - FUNC="overrides" - TIME="overrides" - ARGS="" - ERR="" -) -stage $GO - -GO=( - FUNC="mpfm" - TIME="pkg-file-mapping" - ARGS="" - ERR="false" -) -stage $GO - -state "packages/contents" -GO=( - FUNC="packages" - TIME="apt-ftparchive" - ARGS="" - ERR="" -) -stage $GO - -state "dists/" -GO=( - FUNC="pdiff" - TIME="pdiff" - ARGS="" - ERR="" -) -stage $GO - -GO=( - FUNC="gitpdiff" - TIME="gitpdiff" - ARGS="" - ERR="" -) -#stage $GO - -GO=( - FUNC="release" - TIME="release files" - ARGS="" - ERR="" -) -stage $GO - -GO=( - FUNC="dakcleanup" - TIME="cleanup" - ARGS="" - ERR="" -) -stage $GO - -state "scripts" -GO=( - FUNC="mkmaintainers" - TIME="mkmaintainers" - ARGS="" - ERR="" -) -stage $GO - -GO=( - FUNC="copyoverrides" - TIME="copyoverrides" - ARGS="" - ERR="" -) -stage $GO - -GO=( - FUNC="mklslar" - TIME="mklslar" - ARGS="" - ERR="" -) -stage $GO - -GO=( - FUNC="mkfilesindices" - TIME="mkfilesindices" - ARGS="" - ERR="" -) -stage $GO - -GO=( - FUNC="mkchecksums" - TIME="mkchecksums" - ARGS="" - ERR="" -) -stage $GO - -GO=( - FUNC="mirror" - TIME="mirror hardlinks" - ARGS="" - ERR="" -) -stage $GO - -GO=( - FUNC="ddaccess" - TIME="ddaccessible sync" - ARGS="" - ERR="false" -) -stage $GO - -remove_all_locks -trap - EXIT TERM HUP INT QUIT - -ts "locked part finished" -state "postlock" - -GO=( - FUNC="changelogs" - TIME="changelogs" - ARGS="" - ERR="false" -) -stage $GO & - -GO=( - FUNC="pg_timestamp" - TIME="pg_dump2" - ARGS="postdinstall" - ERR="" -) -stage $GO - -GO=( - FUNC="expire" - TIME="expire_dumps" - ARGS="" - ERR="" -) -stage $GO & - -GO=( - FUNC="transitionsclean" - TIME="transitionsclean" - ARGS="" - ERR="" -) -stage $GO & - -GO=( - FUNC="dm" - TIME="" - ARGS="" - ERR="" -) -stage $GO & - -GO=( - FUNC="bts" - TIME="" - ARGS="" - ERR="false" -) -stage $GO & - -GO=( - FUNC="mirrorpush" - TIME="mirrorpush" - ARGS="" - ERR="false" -) -stage $GO & - -GO=( - FUNC="mirrorpush-backports" - TIME="mirrorpush-backports" - ARGS="" - ERR="false" -) -stage $GO & - -GO=( - FUNC="i18n2" - TIME="i18n 2" - ARGS="" - ERR="false" -) -stage $GO & - -GO=( - FUNC="stats" - TIME="stats" - ARGS="" - ERR="false" -) -stage $GO & - -GO=( - FUNC="testingsourcelist" - TIME="" - ARGS="" - ERR="false" -) -stage $GO & - -rm -f "${LOCK_BRITNEY}" - -GO=( - FUNC="cleantransactions" - TIME="" - ARGS="" - ERR="" -) -stage $GO +# This loop simply wants to be fed by a list of values (see below) +# which consists of 5 values currently. +# The first four are the array values for the stage function, the +# fifths tells us if we should background the stage call. +# +# - FUNC - the function name to call +# - ARGS - Possible arguments to hand to the function. Can be the empty string +# - TIME - The timestamp name. Can be the empty string +# - ERR - if this is the string false, then the call will be surrounded by +# set +e ... set -e calls, so errors in the function do not exit +# dinstall. Can be the empty string, meaning true. +# - BG - Background the function stage? +# +# ATTENTION: Spaces in arguments or timestamp names need to be escaped by \ +# +# ATTENTION: There are two special values for the first column (FUNC). +# STATE - do not call stage function, call the state +# function to update the public statefile "where is dinstall" +# NOSTAGE - do not call stage function, call the command directly. +while read FUNC ARGS TIME ERR BACKGROUND; do + debug "FUNC: $FUNC ARGS: $ARGS TIME: $TIME ERR: $ERR BG: $BACKGROUND" + + # Empty values in the value list are the string "none" (or the + # while read loop won't work). Here we ensure that variables that + # can be empty, are empty if the string none is set for them. + for var in ARGS TIME; do + if [[ ${!var} == none ]]; then + typeset ${var}='' + fi + done + + case ${FUNC} in + STATE) + state ${ARGS} + ;; + NOSTAGE) + ${ARGS} + ;; + *) + GO=( + FUNC=${FUNC} + TIME=${TIME} + ARGS=${ARGS} + ERR=${ERR} + ) + if [[ ${BACKGROUND} == true ]]; then + stage $GO & + else + stage $GO + fi + ;; + esac +done < <(cat - <