[Git][ftp-team/dak][master] Remove pre and post cronscript functionality

Joerg Jaspert pushed to branch master at Debian FTP Team / dak

Commits:

11aa8056

by Joerg Jaspert at 2018-05-18T15:51:53+02:00

Remove pre and post cronscript functionality

The new way of handling reboot lock would make em run outside of it,
which isnt what we want.

We did not use precronscript anymore, we only had one usage of
postcronscript, which can run as a normal task.

3 changed files:

config/debian/cronscript
config/debian/dinstall.functions
config/debian/dinstall.tasks

Changes:

config/debian/cronscript

@@ -283,12 +283,6 @@ function laststeps() {
      # and ensure its no longer used
      exec > "$logdir/after${PROGRAM}.log" 2>&1
 -    # If there is a postcronscript function, we run it, if script was successful
 -    postfunc=$(type -t postcronscript || echo "")
 -    if [[ ${successval} -eq 0 ]] && [[ -n ${postfunc} ]] && [[ ${postfunc} = function ]]; then
 -        postcronscript
 -    fi
+-
      # Now, at the very (successful) end of this run, make sure we remove
      # our stage files, so the next script run will do it all again.
      if [[ ${successval} -eq 0 ]]; then
@@ -323,12 +317,6 @@ function laststeps() {
      # Get rid of tempfiles at the end
      trap cleanup EXIT TERM HUP INT QUIT
 -    # If there is a precronscript function, we run it.
 -    prefunc=$(type -t precronscript || echo "")
 -    if [[ -n ${prefunc} ]] && [[ ${prefunc} = function ]]; then
 -        precronscript
 -    fi
+-
      # An easy access by name for the current log
      ln -sf ${LOGFILE} ${logdir}/${PROGRAM}

config/debian/dinstall.functions

@@ -644,6 +644,5 @@ function startup() {
  function postcronscript() {
      trap - ERR
      logstats ${LOGFILE}
 -    state "all done"
      touch "${DINSTALLEND}"
+ }

config/debian/dinstall.tasks

@@ -53,3 +53,5 @@ i18n2                  none                       i18n\ 2                    fal
  stats                  none                       stats                      false     true
  testingsourcelist      none                       none                       false     true
  cleantransactions      none                       none                       false     false
 +postcronscript         none                       none                       false     false
 +STATE                  all\ done                  none                       false     false