[dak/master] cron
modify for new world order
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
config/debian/common | 35 ++++++++++++++++++-----------------
config/debian/cron.hourly | 6 +++---
config/debian/cron.unchecked | 8 ++++----
3 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/config/debian/common b/config/debian/common
index 599f8dc..c79ad81 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -45,22 +45,23 @@ function make_buildd_dir () {
# move accepted NEW packages from stagedir into queue/accepted
function acceptnew () {
- cd $newstage
- for file in $(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs); do
- sed '1,/Files:/d' "${file}" | sed '/BEGIN PGP SIGNATURE/,$d' \
- | while read notused1 notused2 notused3 notused4 NAME; do
- if [ -z "${NAME}" ]; then
- # Sometimes there is a newline after the Files:, ignore it
- continue
- fi
- if [ -f "${NAME}" ]; then
- mv --target-directory="${accepted}" "${NAME}"
- else
- log_error "Error, couldn't find file ${NAME} to move to ${accepted}"
- fi
- done
- mv --target-directory="${accepted}" "${file}" "${file%%.changes}.dak"
- done
+ return
+ # cd $newstage
+ # for file in $(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs); do
+ # sed '1,/Files:/d' "${file}" | sed '/BEGIN PGP SIGNATURE/,$d' \
+ # | while read notused1 notused2 notused3 notused4 NAME; do
+ # if [ -z "${NAME}" ]; then
+ # # Sometimes there is a newline after the Files:, ignore it
+ # continue
+ # fi
+ # if [ -f "${NAME}" ]; then
+ # mv --target-directory="${accepted}" "${NAME}"
+ # else
+ # log_error "Error, couldn't find file ${NAME} to move to ${accepted}"
+ # fi
+ # done
+ # mv --target-directory="${accepted}" "${file}" "${file%%.changes}.dak"
+ # done
}
# Do the unchecked processing, in case we have files.
@@ -73,7 +74,7 @@ function do_unchecked () {
UNCHECKED_WITHOUT_LOCK=${UNCHECKED_WITHOUT_LOCK:-""}
echo "$timestamp": ${changes:-"Nothing to do"} >> $report
- dak process-unchecked -a ${UNCHECKED_WITHOUT_LOCK} -d "$unchecked" >> $report
+ dak process-upload -a ${UNCHECKED_WITHOUT_LOCK} -d "$unchecked" >> $report
}
function sync_debbugs () {
diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 649445c..2495502 100755
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -11,10 +11,10 @@ date -u > $ftpdir/project/trace/ftp-master.debian.org
echo "Using dak v1" >> $ftpdir/project/trace/ftp-master.debian.org
echo "Running on host: $(hostname -f)" >> $ftpdir/project/trace/ftp-master.debian.org
dak import-users-from-passwd
-dak queue-report -n > $webdir/new.html
-dak queue-report -8 -d accepted,new,byhand,proposedupdates,oldproposedupdates
+#dak queue-report -n > $webdir/new.html
+#dak queue-report -8 -d accepted,new,byhand,proposedupdates,oldproposedupdates
dak show-deferred > ${webdir}/deferred.html
-cd $queuedir/new ; dak show-new *.changes > /dev/null
+#cd $queuedir/new ; dak show-new *.changes > /dev/null
$base/dak/tools/queue_rss.py -q $queuedir/new -o $webdir/rss/ -d $base/misc
$base/dak/tools/removals.pl > $webdir/rss/removals.rss
diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index b3c078e..70a3ae7 100755
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -59,7 +59,7 @@ cleanup() {
function do_buildd () {
if lockfile -r3 $NOTICE; then
LOCKDAILY="YES"
- psql projectb -A -t -q -c "SELECT filename FROM queue_build WHERE queue = 0 AND suite = 5 AND in_queue = true AND filename ~ 'd(sc|eb)$'" > $dbdir/dists/unstable_accepted.list
+ psql projectb -A -t -q -c "SELECT build_queue.path || '/' || build_queue_files.filename FROM build_queue_files LEFT JOIN build_queue ON (build_queue.id = build_queue_files.build_queue_id) WHERE queue_name = 'accepted' AND filename ~ 'd(sc|eb)$';" > $dbdir/dists/unstable_accepted.list
cd $overridedir
dak make-overrides &>/dev/null
rm -f override.sid.all3 override.sid.all3.src
@@ -79,9 +79,9 @@ function do_buildd () {
# the actual unchecked functions follow #
########################################################################
-lockfile -r3 "$LOCK_NEW"
-acceptnew
-rm -f "$LOCK_NEW"
+#lockfile -r3 "$LOCK_NEW"
+# acceptnew
+#rm -f "$LOCK_NEW"
# only run one cron.unchecked
lockfile -r3 $LOCKFILE || exit 0
--
1.6.3.3
Reply to: