Commit a7dc9a3f authored by Ansgar's avatar Ansgar

Merge branch 'fix-dinstall-stage' into 'master'

Fix dinstall stage file

See merge request !70
parents 742ed645 d88ab4a5
Pipeline #7909 passed with stage
in 5 minutes and 14 seconds
# FUNC ARGS TIME ERR BG
INCLUDE lock none true false
STATE startup none false false
NOSTAGE state\ startup none false false
LOCK DAILY 3600 exclusive false
RMSTAGE none none false false
NOSTAGE startup none false false
STATE indices none false false
NOSTAGE state\ indices none false false
LOCK UNCHECKED 1200 exclusive false
dominate none dominate true false
mpfm none pkg-file-mapping false false
STATE packages/contents none true false
NOSTAGE state\ packages/contents none false false
packages none apt-ftparchive true false
STATE dists/ none false false
NOSTAGE state\ dists/ none false false
release none release\ files true false
STATE scripts none false false
NOSTAGE state\ scripts none false false
mirror none mirror\ hardlinks true false
STATE postlock none false false
NOSTAGE state\ postlock none false false
mirrorpush none mirrorpush false true
UNLOCK UNCHECKED none false false
UNLOCK DAILY none false false
NOSTAGE state\ all\ done none false false
......@@ -126,8 +126,6 @@ function _runtasks() {
# ATTENTION: Spaces in arguments or timestamp names need to be escaped by \
#
# NOTE 1: There are 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.
# RMSTAGE - clean out the stages directory, and as such
# the recording what already ran in an earlier cronscript.
......@@ -159,9 +157,6 @@ function _runtasks() {
fi
done
case ${FUNC} in
STATE)
state ${ARGS}
;;
NOSTAGE)
${ARGS}
;;
......
......@@ -594,7 +594,7 @@ function state() {
RIGHTNOW="$(date -u +"%a %b %d %T %Z %Y (%s)")"
cat >"${DINSTALLSTATE}" <<EOF
Dinstall start: ${DINSTALLBEGIN}
Current action: ${1}
Current action: $*
Action start: ${RIGHTNOW}
EOF
}
......
# FUNC ARGS TIME ERR BG
INCLUDE lock none true false
STATE startup none false false
NOSTAGE state\ startup none false false
LOCK DAILY 3600 exclusive false
NOSTAGE startup none false false
savetimestamp none none false false
......@@ -16,19 +16,19 @@ punew stable-new p-u-new fal
opunew oldstable-new o-p-u-new false false
backports_policy none backports-policy false false
cruft none cruft true false
STATE indices none false false
NOSTAGE state\ indices none false false
dominate none dominate true false
autocruft none autocruft true false
fingerprints none import-keyring false true
overrides none overrides true false
mpfm none pkg-file-mapping false false
STATE packages/contents none true false
NOSTAGE state\ packages/contents none false false
packages none apt-ftparchive true false
STATE dists/ none false false
NOSTAGE state\ dists/ none false false
pdiff none pdiff true false
release none release\ files true false
dakcleanup none cleanup true false
STATE scripts none false false
NOSTAGE state\ scripts none false false
mkmaintainers none mkmaintainers true false
copyoverrides none copyoverrides true false
mklslar none mklslar true false
......@@ -39,7 +39,7 @@ signotherfiles none signotherfiles tru
mirror none mirror\ hardlinks true false
UNLOCK UNCHECKED none false false
UNLOCK DAILY none false false
STATE postlock none false false
NOSTAGE state\ postlock none false false
ddaccess none ddaccessible\ sync false true
LOCK CHANGELOG 300 exclusive false
changelogs none changelogs false true
......@@ -54,4 +54,4 @@ stats none stats fal
testingsourcelist none none false true
cleantransactions none none false false
postcronscript none none false false
STATE all\ done none false false
NOSTAGE state\ all\ done none false false
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment