Move ddaccess sync out of the locked area and background it

[dak.git] / config / debian / cron.dinstall

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index be7413a4ca25c161618d631569e3a32f0c49f594..068ac625e98b1a6d4cd00aa368b330b2d74dd25c 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -71,17 +71,17 @@ function stage() {
     ARGS='GO[@]'
     local "${!ARGS}"
 
     ARGS='GO[@]'
     local "${!ARGS}"
 

-    error=${ERR:-"true"}
+    local error=${ERR:-"true"}

 
     ARGS=${ARGS:-""}
 
     log "########## DINSTALL BEGIN: ${FUNC} ${ARGS} ##########"
 
     ARGS=${ARGS:-""}
 
     log "########## DINSTALL BEGIN: ${FUNC} ${ARGS} ##########"

-    STAGEFILE="${stagedir}/${FUNC}_${ARGS}"
+    local STAGEFILE="${stagedir}/${FUNC}_${ARGS}"

     STAGEFILE=${STAGEFILE// /_}
     if [ -f "${STAGEFILE}" ]; then
     STAGEFILE=${STAGEFILE// /_}
     if [ -f "${STAGEFILE}" ]; then

-        stamptime=$(/usr/bin/stat -c %Z "${STAGEFILE}")
-        unixtime=$(date +%s)
-        difference=$(( $unixtime - $stamptime ))
+        local stamptime=$(/usr/bin/stat -c %Z "${STAGEFILE}")
+        local unixtime=$(date +%s)
+        local difference=$(( $unixtime - $stamptime ))

         if [ ${difference} -ge 14400 ]; then
             log_error "Did already run ${FUNC}, stagefile exists, but that was ${difference} seconds ago. Please check."
         else
         if [ ${difference} -ge 14400 ]; then
             log_error "Did already run ${FUNC}, stagefile exists, but that was ${difference} seconds ago. Please check."
         else


@@ -224,7 +224,7 @@ while read FUNC ARGS TIME ERR BACKGROUND; do
     esac
 done < <(cat - <<EOF
 savetimestamp          none                       none                       false   false
     esac
 done < <(cat - <<EOF
 savetimestamp          none                       none                       false   false

-qa1                    none                       init                       false   true
+qa1                    none                       init                       true    true

 pg_timestamp           predinstall                pg_dump1                   false   false
 updates                none                       External\ Updates          false   false
 i18n1                  none                       i18n\ 1                    false   false
 pg_timestamp           predinstall                pg_dump1                   false   false
 updates                none                       External\ Updates          false   false
 i18n1                  none                       i18n\ 1                    false   false


@@ -236,7 +236,7 @@ backports_policy       none                       backports-policy           fal
 cruft                  none                       cruft                      false   false
 STATE                  indices                    none                       false   false
 dominate               none                       dominate                   false   false
 cruft                  none                       cruft                      false   false
 STATE                  indices                    none                       false   false
 dominate               none                       dominate                   false   false

-autocruft              unstable\ experimental     autocruft                  false   false
+autocruft              none                       autocruft                  false   false

 fingerprints           none                       import-keyring             false   false
 overrides              none                       overrides                  false   false
 mpfm                   none                       pkg-file-mapping           false   false
 fingerprints           none                       import-keyring             false   false
 overrides              none                       overrides                  false   false
 mpfm                   none                       pkg-file-mapping           false   false


@@ -253,9 +253,9 @@ mklslar                none                       mklslar                    fal
 mkfilesindices         none                       mkfilesindices             false   false
 mkchecksums            none                       mkchecksums                false   false
 mirror                 none                       mirror\ hardlinks          false   false
 mkfilesindices         none                       mkfilesindices             false   false
 mkchecksums            none                       mkchecksums                false   false
 mirror                 none                       mirror\ hardlinks          false   false

-ddaccess               none                       ddaccessible\ sync         false   false

 NOSTAGE                remove_locks               none                       false   false
 STATE                  postlock                   none                       false   false
 NOSTAGE                remove_locks               none                       false   false
 STATE                  postlock                   none                       false   false

+ddaccess               none                       ddaccessible\ sync         true    true

 changelogs             none                       changelogs                 false   true
 pg_timestamp           postdinstall               pg_dump2                   false   false
 expire                 none                       expire_dumps               false   true
 changelogs             none                       changelogs                 false   true
 pg_timestamp           postdinstall               pg_dump2                   false   false
 expire                 none                       expire_dumps               false   true