Fix C/P error

[dak.git] / config / debian / common

diff --git a/config/debian/common b/config/debian/common
index f611c19e55b22dffe4ee5f60cdeee3805819d889..3a45b45649469ce5bd1f73d42a856dca71e40bb0 100644 (file)
--- a/config/debian/common
+++ b/config/debian/common
@@ -36,6 +36,8 @@ function make_buildd_dir () {
     dak manage-build-queues -a
 
     for dist in $(ls -1 ${incoming}/dists/); do
+        # Skip project trace directory
+        if [ "${dist}x" = "projectx" ]; then continue; fi
         cd ${incoming}/dists/${dist}
         mkdir -p tree/${STAMP}
         cp -al ${incoming}/dists/${dist}/buildd/. tree/${STAMP}/
@@ -45,6 +47,30 @@ function make_buildd_dir () {
 
 }
 
+# Process (oldstable)-proposed-updates "NEW" queue
+function punew_do() {
+    date -u -R >> REPORT
+    dak process-policy $1 | tee -a REPORT | mail -a "X-Debian: DAK" -e -s "NEW changes in $1" debian-release@lists.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
+    echo >> REPORT
+}
+
+# These versions used in dinstall
+function punew() {
+    if [ "${PROGRAM}" = "dinstall" ]; then
+        log "Doing automated p-u-new processing"
+    fi
+    cd "${queuedir}/p-u-new"
+    punew_do "$1"
+}
+
+function opunew() {
+    if [ "${PROGRAM}" = "dinstall" ]; then
+        log "Doing automated o-p-u-new processing"
+    fi
+    cd "${queuedir}/o-p-u-new"
+    punew_do "$1"
+}
+
 # Do the unchecked processing, in case we have files.
 function do_unchecked () {
     cd $unchecked
@@ -104,3 +130,9 @@ function reports() {
     dak cruft-report -s experimental >> $webdir/cruft-report-daily.txt
     cat $webdir/cruft-report-daily.txt | mail -a "X-Debian: DAK" -e -s "Debian archive cruft report for $(date +%D)" ftpmaster@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
 }
+
+function pg_timestamp() {
+    tsname=${1:-"unknown"}
+    log "Saving postgres transaction id for ${tsname}"
+    psql -tAc 'select txid_current();' > $base/backup/txid_${tsname}_$(date +%Y.%m.%d-%H:%M:%S)
+}