Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  lenny's python-apt does not support "#" comments.
  no i-u-f-p
  cron

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/debian/common b/config/debian/common
index 599f8dc55a02c517cfc3e39852a253b9c1161064..c79ad810b3cc12a77f673e5e3e040e4eaf5133ab 100644 (file)
--- 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 649445c293177aeae55c26cbe5629e94a2842dea..34d1b59e144eba9cdc2e261d623f593d877751b7 100755 (executable)
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -10,11 +10,11 @@ export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
 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 import-users-from-passwd
+#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 b3c078e30d3925ba565782627e34462e67656b5d..70a3ae766ffe8e660644334ca0f645dc29ffdfd6 100755 (executable)
--- 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

diff --git a/tests/fixtures/dak.conf b/tests/fixtures/dak.conf
index 94992fe5c700bb7c8a96338df647a6fda7705f4a..a73884088bb405b45dc17da462afc6a241622254 100644 (file)
--- a/tests/fixtures/dak.conf
+++ b/tests/fixtures/dak.conf
@@ -1,4 +1,4 @@
-# For extract_component_from_section tests
+// For extract_component_from_section tests
 
 Component
 {