[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[dak/bpo] dinstall



implement various  comments and suggestions from mhy

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
 config/debian/dinstall |  604 +++++++++++++++++++++++-------------------------
 1 files changed, 295 insertions(+), 309 deletions(-)

diff --git a/config/debian/dinstall b/config/debian/dinstall
index 2627e59..0f6a7c8 100755
--- a/config/debian/dinstall
+++ b/config/debian/dinstall
@@ -28,20 +28,6 @@ export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
 ########################################################################
 # Functions                                                            #
 ########################################################################
-# Rotate logfiles
-function savelog() {
-    torotate="$1"
-    count=${2:-${LOGROTATE}}
-    while [ ${count} -gt 0 ]; do
-        prev=$(( count - 1 ))
-        if [ -e "${torotate}.${prev}" ]; then
-            mv "${torotate}.${prev}" "${torotate}.${count}"
-        fi
-        count=$prev
-    done
-    mv "${torotate}" "${torotate}.0"
-}
-
 # log something (basically echo it together with a timestamp)
 #
 # Set $PROGRAM to a string to have it added to the output.
@@ -55,7 +41,7 @@ function log () {
 
 # log the message using log() but then also send a mail
 # to the address configured in MAILTO (if non-empty)
-function error () {
+function log_error () {
         log "$@"
         if [ -z "${MAILTO}" ]; then
                 echo "$@" | mail -e -s "[$PROGRAM@$(hostname -s)] ERROR [$$]" ${MAILTO}
@@ -64,9 +50,9 @@ function error () {
 
 # debug log, only output when DEBUG=1
 function debug () {
-	if [ $DEBUG -eq 1 ]; then
-		log "$*"
-	fi
+    if [ $DEBUG -eq 1 ]; then
+        log "$*"
+    fi
 }
 
 # Timestamp. Used for dinstall stat graphs
@@ -77,13 +63,13 @@ function ts() {
 
 # Cleanup actions
 function cleanup() {
-	savelog "$LOGFILE"
+    savelog -c ${LOGROTATE} -j "$LOGFILE"
 }
 
 # Setup the notice file to tell bad mirrors they used the wrong time
 function notice() {
-	rm -f "$NOTICE"
-	cat > "$NOTICE" <<EOF
+    rm -f "$NOTICE"
+    cat > "$NOTICE" <<EOF
 Packages are currently being installed and indices rebuilt.
 Maintenance is automatic, starting at 01|07|13|19:52 UTC,
 and ending about an hour later.  This file is then removed.
@@ -92,69 +78,69 @@ You should not mirror the archive during this period.
 EOF
 }
 
-# ushing merkels QA user, part one
+# pushing merkels QA user, part one
 function merkel1() {
-	log "Telling merkels QA user that we start dinstall"
-	ssh -2 -i ~dak/.ssh/push_merkel_qa  -o BatchMode=yes -o SetupTimeOut=90 -o ConnectTimeout=90 qa@merkel.debian.org sleep 1
+    log "Telling merkels QA user that we start dinstall"
+    ssh -2 -i ~dak/.ssh/push_merkel_qa  -o BatchMode=yes -o SetupTimeOut=90 -o ConnectTimeout=90 qa@merkel.debian.org sleep 1
 }
 
 # Create the postgres dump files
 function pgdump_pre() {
-	log "Creating pre-daily-cron-job backup of projectb database..."
-	pg_dump projectb > $base/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
+    log "Creating pre-daily-cron-job backup of projectb database..."
+    pg_dump projectb > $base/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
 }
 
 function pgdump_post() {
-	log "Creating post-daily-cron-job backup of projectb database..."
-	cd $base/backup
-	POSTDUMP=$base/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
-	pg_dump projectb > $POSTDUMP
-	ln -sf $POSTDUMP current
+    log "Creating post-daily-cron-job backup of projectb database..."
+    cd $base/backup
+    POSTDUMP=$base/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
+    pg_dump projectb > $POSTDUMP
+    ln -sf $POSTDUMP current
 }
 
 # Updating various files
 function updates() {
-	log "Updating Bugs docu, Mirror list and mailing-lists.txt"
-	cd $configdir
-	$scriptsdir/update-bugdoctxt
-	$scriptsdir/update-mirrorlists
-	$scriptsdir/update-mailingliststxt
-	$scriptsdir/update-pseudopackages.sh
+    log "Updating Bugs docu, Mirror list and mailing-lists.txt"
+    cd $configdir
+    $scriptsdir/update-bugdoctxt
+    $scriptsdir/update-mirrorlists
+    $scriptsdir/update-mailingliststxt
+    $scriptsdir/update-pseudopackages.sh
 }
 
 # Process (oldstable)-proposed-updates "NEW" queue
 function punew_do() {
-	cd "${queuedir}/${1}"
-	date -u -R >> REPORT
-	dak process-new -a -C COMMENTS >> REPORT || true
-	echo >> REPORT
+    cd "${queuedir}/${1}"
+    date -u -R >> REPORT
+    dak process-new -a -C COMMENTS >> REPORT || true
+    echo >> REPORT
 }
 function punew() {
-	log "Doing automated p-u-new processing"
-	punew_do "$1"
+    log "Doing automated p-u-new processing"
+    punew_do "$1"
 }
 function opunew() {
-	log "Doing automated o-p-u-new processing"
-	punew_do "$1"
+    log "Doing automated o-p-u-new processing"
+    punew_do "$1"
 }
 
 # The first i18n one, syncing new descriptions
 function i18n1() {
-	log "Synchronizing i18n package descriptions"
+    log "Synchronizing i18n package descriptions"
     # First sync their newest data
-	cd ${scriptdir}/i18nsync
-	rsync -aq --delete --delete-after ddtp-sync:/does/not/matter . || true
+    cd ${scriptdir}/i18nsync
+    rsync -aq --delete --delete-after ddtp-sync:/does/not/matter . || true
 
     # Now check if we still know about the packages for which they created the files
     # is the timestamp signed by us?
-	if $(gpgv --keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg timestamp.gpg timestamp); then
+    if $(gpgv --keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg timestamp.gpg timestamp); then
         # now read it. As its signed by us we are sure the content is what we expect, no need
         # to do more here. And we only test -d a directory on it anyway.
-		TSTAMP=$(cat timestamp)
+        TSTAMP=$(cat timestamp)
         # do we have the dir still?
-		if [ -d ${scriptdir}/i18n/${TSTAMP} ]; then
+        if [ -d ${scriptdir}/i18n/${TSTAMP} ]; then
             # Lets check!
-			if ${scriptsdir}/ddtp-i18n-check.sh . ${scriptdir}/i18n/${TSTAMP}; then
+            if ${scriptsdir}/ddtp-i18n-check.sh . ${scriptdir}/i18n/${TSTAMP}; then
                 # Yay, worked, lets copy around
                 for dir in squeeze sid; do
                     if [ -d dists/${dir}/ ]; then
@@ -167,185 +153,185 @@ function i18n1() {
                 echo "ARRRR, bad guys, wrong files, ARRR"
                 echo "Arf, Arf, Arf, bad guys, wrong files, arf, arf, arf" | mail -s "Don't you kids take anything. I'm watching you. I've got eye implants in the back of my head." debian-l10n-devel@lists.alioth.debian.org
             fi
-		else
+        else
             echo "ARRRR, missing the timestamp ${TSTAMP} directory, not updating i18n, ARRR"
             echo "Arf, Arf, Arf, missing the timestamp ${TSTAMP} directory, not updating i18n, arf, arf, arf" | mail -s "Lisa, if you don't like your job you don't strike. You just go in every day and do it really half-assed. That's the American way." debian-l10n-devel@lists.alioth.debian.org
         fi
-	else
-		echo "ARRRRRRR, could not verify our timestamp signature, ARRR. Don't mess with our files, i18n guys, ARRRRR."
+    else
+        echo "ARRRRRRR, could not verify our timestamp signature, ARRR. Don't mess with our files, i18n guys, ARRRRR."
         echo "Arf, Arf, Arf, could not verify our timestamp signature, arf. Don't mess with our files, i18n guys, arf, arf, arf" | mail -s "You can't keep blaming yourself. Just blame yourself once, and move on." debian-l10n-devel@lists.alioth.debian.org
-	fi
+    fi
 }
 
 # Process the accepted queue
 function accepted() {
-	log "Processing queue/accepted"
-	cd "$accepted"
-	rm -f REPORT
-	dak process-accepted -pa *.changes | tee REPORT | \
-		mail -s "Install for $(date +"%D - %R")" ftpmaster@ftp-master.debian.org
-	chgrp debadmin REPORT
-	chmod 664 REPORT
+    log "Processing queue/accepted"
+    cd "$accepted"
+    rm -f REPORT
+    dak process-accepted -pa *.changes | tee REPORT | \
+        mail -s "Install for $(date +"%D - %R")" ftpmaster@ftp-master.debian.org
+    chgrp debadmin REPORT
+    chmod 664 REPORT
 }
 
 function cruft() {
-	log "Checking for cruft in overrides"
-	dak check-overrides
+    log "Checking for cruft in overrides"
+    dak check-overrides
 
-	log "Fixing symlinks in $ftpdir"
-	symlinks -d -r $ftpdir
+    log "Fixing symlinks in $ftpdir"
+    symlinks -d -r $ftpdir
 }
 
 function msfl() {
-	log "Generating suite file lists for apt-ftparchive"
-	dak make-suite-file-list
+    log "Generating suite file lists for apt-ftparchive"
+    dak make-suite-file-list
 }
 
 function fingerprints() {
-	log "Updating fingerprints"
-	dak import-keyring -L /srv/keyring.debian.org/keyrings/debian-keyring.gpg
+    log "Updating fingerprints"
+    dak import-keyring -L /srv/keyring.debian.org/keyrings/debian-keyring.gpg
 }
 
 function overrides() {
-	log "Writing overrides into text files"
-	cd $overridedir
-	dak make-overrides
+    log "Writing overrides into text files"
+    cd $overridedir
+    dak make-overrides
 
     # FIXME
-	rm -f override.sid.all3
-	for i in main contrib non-free main.debian-installer; do cat override.sid.$i >> override.sid.all3; done
+    rm -f override.sid.all3
+    for i in main contrib non-free main.debian-installer; do cat override.sid.$i >> override.sid.all3; done
 }
 
 function mpfm() {
-	log "Generating package / file mapping"
-	dak make-pkg-file-mapping | bzip2 -9 > $base/ftp/indices/package-file.map.bz2
+    log "Generating package / file mapping"
+    dak make-pkg-file-mapping | bzip2 -9 > $base/ftp/indices/package-file.map.bz2
 }
 
 function packages() {
-	log "Generating Packages and Sources files"
-	cd $configdir
-	apt-ftparchive generate apt.conf
+    log "Generating Packages and Sources files"
+    cd $configdir
+    apt-ftparchive generate apt.conf
 }
 
 function pdiff() {
-	log "Generating pdiff files"
-	dak generate-index-diffs
+    log "Generating pdiff files"
+    dak generate-index-diffs
 }
 
 function release() {
-	log "Generating Release files"
-	dak generate-releases
+    log "Generating Release files"
+    dak generate-releases
 }
 
 function cleanup() {
-	log "Cleanup old packages/files"
-	dak clean-suites
-	dak clean-queues
+    log "Cleanup old packages/files"
+    dak clean-suites
+    dak clean-queues
 }
 
 function buildd() {
     # Needs to be rebuilt, as files have moved.  Due to unaccepts, we need to
     # update this before wanna-build is updated.
-	log "Regenerating wanna-build/buildd information"
-	psql projectb -A -t -q -c "SELECT filename FROM queue_build WHERE suite = 5 AND queue = 0 AND in_queue = true AND filename ~ 'd(sc|eb)$'" > $dbdir/dists/unstable_accepted.list
-	symlinks -d /srv/incoming.debian.org/buildd > /dev/null
-	apt-ftparchive generate apt.conf.buildd
+    log "Regenerating wanna-build/buildd information"
+    psql projectb -A -t -q -c "SELECT filename FROM queue_build WHERE suite = 5 AND queue = 0 AND in_queue = true AND filename ~ 'd(sc|eb)$'" > $dbdir/dists/unstable_accepted.list
+    symlinks -d /srv/incoming.debian.org/buildd > /dev/null
+    apt-ftparchive generate apt.conf.buildd
 }
 
 function scripts() {
-	log "Running various scripts from $scriptsdir"
-	cd $scriptsdir
-	./mkmaintainers
-	./copyoverrides
-	./mklslar
-	./mkfilesindices
-	./mkchecksums
+    log "Running various scripts from $scriptsdir"
+    cd $scriptsdir
+    ./mkmaintainers
+    ./copyoverrides
+    ./mklslar
+    ./mkfilesindices
+    ./mkchecksums
 }
 
 function mirror() {
-	echo "Regenerating \"public\" mirror/ hardlink fun"
-	cd ${mirrordir}
-	rsync -aH --link-dest ${ftpdir} --delete --delete-after --ignore-errors ${ftpdir}/. .
+    echo "Regenerating \"public\" mirror/ hardlink fun"
+    cd ${mirrordir}
+    rsync -aH --link-dest ${ftpdir} --delete --delete-after --ignore-errors ${ftpdir}/. .
 }
 
 function wb() {
-	log "Trigger daily wanna-build run"
-	ssh -o BatchMode=yes -o SetupTimeOut=90 -o ConnectTimeout=90 wbadm@buildd /org/wanna-build/trigger.daily || echo "W-B trigger.daily failed" | mail -s "W-B Daily trigger failed" ftpmaster@ftp-master.debian.org
+    log "Trigger daily wanna-build run"
+    ssh -o BatchMode=yes -o SetupTimeOut=90 -o ConnectTimeout=90 wbadm@buildd /org/wanna-build/trigger.daily || echo "W-B trigger.daily failed" | mail -s "W-B Daily trigger failed" ftpmaster@ftp-master.debian.org
 }
 
 function expire() {
-	log "Expiring old database dumps..."
-	cd $base/backup
-	$scriptsdir/expire_dumps -d . -p -f "dump_*"
+    log "Expiring old database dumps..."
+    cd $base/backup
+    $scriptsdir/expire_dumps -d . -p -f "dump_*"
 }
 
 function reports() {
     # Send a report on NEW/BYHAND packages
-	log "Nagging ftpteam about NEW/BYHAND packages"
-	dak queue-report | mail -e -s "NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org
+    log "Nagging ftpteam about NEW/BYHAND packages"
+    dak queue-report | mail -e -s "NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org
     # and one on crufty packages
-	log "Sending information about crufty packages"
-	dak cruft-report > $webdir/cruft-report-daily.txt
-	dak cruft-report -s experimental >> $webdir/cruft-report-daily.txt
-	cat $webdir/cruft-report-daily.txt | mail -e -s "Debian archive cruft report for $(date +%D)" ftpmaster@ftp-master.debian.org
+    log "Sending information about crufty packages"
+    dak cruft-report > $webdir/cruft-report-daily.txt
+    dak cruft-report -s experimental >> $webdir/cruft-report-daily.txt
+    cat $webdir/cruft-report-daily.txt | mail -e -s "Debian archive cruft report for $(date +%D)" ftpmaster@ftp-master.debian.org
 }
 
 function dm() {
-	log "Updating DM html page"
-	$scriptsdir/dm-monitor >$webdir/dm-uploaders.html
+    log "Updating DM html page"
+    $scriptsdir/dm-monitor >$webdir/dm-uploaders.html
 }
 
 function bts() {
-	log "Categorizing uncategorized bugs filed against ftp.debian.org"
-	dak bts-categorize
+    log "Categorizing uncategorized bugs filed against ftp.debian.org"
+    dak bts-categorize
 }
 
 function merkel2() {
     # Push katie@merkel so it syncs the projectb there. Returns immediately, the sync runs detached
-	log "Trigger merkels projectb sync"
-	ssh -2 -o BatchMode=yes -o SetupTimeOut=30 -o ConnectTimeout=30 -i ~/.ssh/push_merkel_projectb katie@merkel.debian.org sleep 1
+    log "Trigger merkels projectb sync"
+    ssh -2 -o BatchMode=yes -o SetupTimeOut=30 -o ConnectTimeout=30 -i ~/.ssh/push_merkel_projectb katie@merkel.debian.org sleep 1
 }
 
 function runparts() {
-	log "Using run-parts to run scripts in $base/scripts/distmnt"
-	run-parts --report $base/scripts/distmnt
+    log "Using run-parts to run scripts in $base/scripts/distmnt"
+    run-parts --report $base/scripts/distmnt
 }
 
 function i18n2() {
-	log "Exporting package data foo for i18n project"
-	STAMP=$(date "+%Y%m%d%H%M")
-	mkdir -p ${scriptdir}/i18n/${STAMP}
-	cd ${scriptdir}/i18n/${STAMP}
-	dak control-suite -l stable > lenny
-	dak control-suite -l testing > squeeze
-	dak control-suite -l unstable > sid
-	echo "${STAMP}" > timestamp
-	gpg --secret-keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 6070D3A1 --detach-sign -o timestamp.gpg timestamp
-	rm -f md5sum
-	md5sum * > md5sum
-	cd ${webdir}/
-	ln -sfT ${scriptdir}/i18n/${STAMP} i18n
-
-	cd ${scriptdir}
-	find ./i18n -mtime +2 -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf
+    log "Exporting package data foo for i18n project"
+    STAMP=$(date "+%Y%m%d%H%M")
+    mkdir -p ${scriptdir}/i18n/${STAMP}
+    cd ${scriptdir}/i18n/${STAMP}
+    dak control-suite -l stable > lenny
+    dak control-suite -l testing > squeeze
+    dak control-suite -l unstable > sid
+    echo "${STAMP}" > timestamp
+    gpg --secret-keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 6070D3A1 --detach-sign -o timestamp.gpg timestamp
+    rm -f md5sum
+    md5sum * > md5sum
+    cd ${webdir}/
+    ln -sfT ${scriptdir}/i18n/${STAMP} i18n
+
+    cd ${scriptdir}
+    find ./i18n -mtime +2 -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf
 }
 
 function stats() {
-	log "Updating stats data"
-	cd $configdir
-	$scriptsdir/update-ftpstats $base/log/* > $base/misc/ftpstats.data
-	R --slave --vanilla < $base/misc/ftpstats.R
+    log "Updating stats data"
+    cd $configdir
+    $scriptsdir/update-ftpstats $base/log/* > $base/misc/ftpstats.data
+    R --slave --vanilla < $base/misc/ftpstats.R
 }
 
 function aptftpcleanup() {
-	log "Clean up apt-ftparchive's databases"
-	cd $configdir
-	apt-ftparchive -q clean apt.conf
+    log "Clean up apt-ftparchive's databases"
+    cd $configdir
+    apt-ftparchive -q clean apt.conf
 }
 
 function compress() {
-	log "Compress old psql backups"
-	cd $base/backup/
+    log "Compress old psql backups"
+    cd $base/backup/
     find -maxdepth 1 -mindepth 1 -type f -name 'dump_*' \! -name '*.bz2' \! -name '*.gz' -mtime +1 |
     while read dumpname; do
         echo "Compressing $dumpname"
@@ -354,7 +340,7 @@ function compress() {
 }
 
 function logstats() {
-	$masterdir/tools/logs.py "$LOGFILE"
+    $masterdir/tools/logs.py "$LOGFILE"
 }
 
 ########################################################################
@@ -377,43 +363,43 @@ function logstats() {
 # MAKE SURE TO KEEP THIS THE LAST FUNCTION, AFTER ALL THE VARIOUS ONES
 # ADDED FOR DINSTALL FEATURES!
 function stage() {
-	ARGS='GO[@]'
-	local "${!ARGS}"
-
-	if [ -f "${stagedir}/${FUNC}" ]; then
-		stamptime=$(/usr/bin/stat -c %Z "${stagedir}/${FUNC}")
-		unixtime=$(date +%s)
-		difference=$(( $unixtime - $stamptime ))
-		if [ ${difference} -ge 14400 ]; then
-			error "Did already run ${FUNC}, stagefile exists, but that was ${difference} seconds ago. Please check."
-		else
-			log "Did already run ${FUNC}, not calling again..."
-		fi
-		return
-	fi
+    ARGS='GO[@]'
+    local "${!ARGS}"
+
+    if [ -f "${stagedir}/${FUNC}" ]; then
+        stamptime=$(/usr/bin/stat -c %Z "${stagedir}/${FUNC}")
+        unixtime=$(date +%s)
+        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
+            log "Did already run ${FUNC}, not calling again..."
+        fi
+        return
+    fi
 
-	debug "Now calling function ${FUNC}. Arguments: ${ARGS}. Timestamp: ${TS}"
+    debug "Now calling function ${FUNC}. Arguments: ${ARGS}. Timestamp: ${TS}"
 
-	# Make sure we are always at the same place. If a function wants to be elsewhere,
-	# it has to cd first!
-	cd ${configdir}
+    # Make sure we are always at the same place. If a function wants to be elsewhere,
+    # it has to cd first!
+    cd ${configdir}
 
-	if [ "${ERR}" = "false"]; then
-		set +e
-	fi
-	${FUNC} ${ARGS}
+    if [ "${ERR}" = "false"]; then
+        set +e
+    fi
+    ${FUNC} ${ARGS}
 
-	# No matter what happened in the function, we make sure we have set -e default state back
-	set -e
+    # No matter what happened in the function, we make sure we have set -e default state back
+    set -e
 
-	# Make sure we are always at the same place.
-	cd ${configdir}
+    # Make sure we are always at the same place.
+    cd ${configdir}
 
-	touch "${stagedir}/${FUNC}"
+    touch "${stagedir}/${FUNC}"
 
-	if [ -n "${TIME}" ]; then
-		ts "${TIME}"
-	fi
+    if [ -n "${TIME}" ]; then
+        ts "${TIME}"
+    fi
 }
 
 ########################################################################
@@ -465,174 +451,174 @@ trap cleanup EXIT ERR TERM HUP INT QUIT
 touch "${LOCK_BRITNEY}"
 
 GO=(
-	FUNC="notice"
-	TIME=""
-	ARGS=""
-	ERR="false"
+    FUNC="notice"
+    TIME=""
+    ARGS=""
+    ERR="false"
 )
 stage $GO
 
 GO=(
-	FUNC="merkel1"
-	TIME="init"
-	ARGS=""
-	ERR="false"
+    FUNC="merkel1"
+    TIME="init"
+    ARGS=""
+    ERR="false"
 )
 stage $GO
 
 GO=(
-	FUNC="pgdump_pre"
-	TIME="pg_dump1"
-	ARGS=""
-	ERR=""
+    FUNC="pgdump_pre"
+    TIME="pg_dump1"
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="updates"
-	TIME="External Updates"
-	ARGS=""
-	ERR=""
+    FUNC="updates"
+    TIME="External Updates"
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="punew"
-	TIME="p-u-new"
-	ARGS="p-u-new"
-	ERR=""
+    FUNC="punew"
+    TIME="p-u-new"
+    ARGS="p-u-new"
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="opunew"
-	TIME="o-p-u-new"
-	ARGS="o-p-u-new"
-	ERR=""
+    FUNC="opunew"
+    TIME="o-p-u-new"
+    ARGS="o-p-u-new"
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="i18n1"
-	TIME="i18n 1"
-	ARGS=""
-	ERR="false"
+    FUNC="i18n1"
+    TIME="i18n 1"
+    ARGS=""
+    ERR="false"
 )
 stage $GO
 
 lockfile "$LOCK_ACCEPTED"
 
 GO=(
-	FUNC="accepted"
-	TIME="accepted"
-	ARGS=""
-	ERR=""
+    FUNC="accepted"
+    TIME="accepted"
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="cruft"
-	TIME="cruft"
-	ARGS=""
-	ERR=""
+    FUNC="cruft"
+    TIME="cruft"
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
 rm -f $LOCKAC
 
 GO=(
-	FUNC="msfl"
-	TIME="make-suite-file-list"
-	ARGS=""
-	ERR=""
+    FUNC="msfl"
+    TIME="make-suite-file-list"
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="fingerprints"
-	TIME="import-keyring"
-	ARGS=""
-	ERR="false"
+    FUNC="fingerprints"
+    TIME="import-keyring"
+    ARGS=""
+    ERR="false"
 )
 stage $GO
 
 GO=(
-	FUNC="overrides"
-	TIME="overrides"
-	ARGS=""
-	ERR=""
+    FUNC="overrides"
+    TIME="overrides"
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="mpfm"
-	TIME="pkg-file-mapping"
-	ARGS=""
-	ERR="false"
+    FUNC="mpfm"
+    TIME="pkg-file-mapping"
+    ARGS=""
+    ERR="false"
 )
 stage $GO
 
 GO=(
-	FUNC="packages"
-	TIME="apt-ftparchive"
-	ARGS=""
-	ERR=""
+    FUNC="packages"
+    TIME="apt-ftparchive"
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="pdiff"
-	TIME="pdiff"
-	ARGS=""
-	ERR=""
+    FUNC="pdiff"
+    TIME="pdiff"
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="release"
-	TIME="release files"
-	ARGS=""
-	ERR=""
+    FUNC="release"
+    TIME="release files"
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="cleanup"
-	TIME="cleanup"
-	ARGS=""
-	ERR=""
+    FUNC="cleanup"
+    TIME="cleanup"
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="buildd"
-	TIME="buildd"
-	ARGS=""
-	ERR=""
+    FUNC="buildd"
+    TIME="buildd"
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="scripts"
-	TIME="scripts"
-	ARGS=""
-	ERR=""
+    FUNC="scripts"
+    TIME="scripts"
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="mirror"
-	TIME="mirror hardlinks"
-	ARGS=""
-	ERR=""
+    FUNC="mirror"
+    TIME="mirror hardlinks"
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="wb"
-	TIME="w-b"
-	ARGS=""
-	ERR=""
+    FUNC="wb"
+    TIME="w-b"
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
@@ -642,94 +628,94 @@ rm -f "${LOCK_DAILY}"
 ts "locked part finished"
 
 GO=(
-	FUNC="pgdump_post"
-	TIME="pg_dump2"
-	ARGS=""
-	ERR=""
+    FUNC="pgdump_post"
+    TIME="pg_dump2"
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="expire"
-	TIME="expire_dumps"
-	ARGS=""
-	ERR=""
+    FUNC="expire"
+    TIME="expire_dumps"
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="reports"
-	TIME="reports"
-	ARGS=""
-	ERR=""
+    FUNC="reports"
+    TIME="reports"
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="dm"
-	TIME=""
-	ARGS=""
-	ERR=""
+    FUNC="dm"
+    TIME=""
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="bts"
-	TIME=""
-	ARGS=""
-	ERR=""
+    FUNC="bts"
+    TIME=""
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="merkel2"
-	TIME="merkel projectb push"
-	ARGS=""
-	ERR="false"
+    FUNC="merkel2"
+    TIME="merkel projectb push"
+    ARGS=""
+    ERR="false"
 )
 stage $GO
 
 ulimit -m 90000 -d 90000 -s 10000 -v 200000
 
 GO=(
-	FUNC="runparts"
-	TIME="run-parts"
-	ARGS=""
-	ERR="false"
+    FUNC="runparts"
+    TIME="run-parts"
+    ARGS=""
+    ERR="false"
 )
 stage $GO
 
 GO=(
-	FUNC="i18n2"
-	TIME="i18n 2"
-	ARGS=""
-	ERR="false"
+    FUNC="i18n2"
+    TIME="i18n 2"
+    ARGS=""
+    ERR="false"
 )
 stage $GO
 
 GO=(
-	FUNC="stats"
-	TIME="stats"
-	ARGS=""
-	ERR="false"
+    FUNC="stats"
+    TIME="stats"
+    ARGS=""
+    ERR="false"
 )
 stage $GO
 
 rm -f ${BRITNEYLOCK}
 
 GO=(
-	FUNC="aptftpcleanup"
-	TIME="apt-ftparchive cleanup"
-	ARGS=""
-	ERR=""
+    FUNC="aptftpcleanup"
+    TIME="apt-ftparchive cleanup"
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
 GO=(
-	FUNC="compress"
-	TIME="compress"
-	ARGS=""
-	ERR=""
+    FUNC="compress"
+    TIME="compress"
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
@@ -738,10 +724,10 @@ log "Daily cron scripts successful, all done"
 exec > /dev/null 2>&1
 
 GO=(
-	FUNC="logstats"
-	TIME=""
-	ARGS=""
-	ERR=""
+    FUNC="logstats"
+    TIME=""
+    ARGS=""
+    ERR=""
 )
 stage $GO
 
-- 
1.5.6.5



Reply to: