From: Joerg Jaspert <joerg@debian.org>
Date: Fri, 1 Jan 2010 16:14:51 +0000 (+0100)
Subject: dinstall
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=be83a167b00a5bc56a91c57f30875d52179e188c;p=dak.git

dinstall

maintain an archive serial: line in the project trace file

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

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 463dec37..cb772fd3 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -390,9 +390,17 @@ function mkchecksums() {
 
 function mirror() {
     log "Regenerating \"public\" mirror/ hardlink fun"
-    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
+    DATE_SERIAL=$(date +"%Y%m%d01")
+    FILESOAPLUS1=$(awk '/serial/ { print $3+1 }' ${TRACEFILE} )
+    if [ "$DATE_SERIAL" -gt "$FILESOAPLUS1" ]; then
+        SERIAL="$DATE_SERIAL"
+    else
+        SERIAL="$FILESOAPLUS1"
+    fi
+    date -u > ${TRACEFILE}
+    echo "Using dak v1" >> ${TRACEFILE}
+    echo "Running on host: $(hostname -f)" >> ${TRACEFILE}
+    echo "Archive serial: ${SERIAL}" >> ${TRACEFILE}
     cd ${mirrordir}
     rsync -aH --link-dest ${ftpdir} --delete --delete-after --ignore-errors ${ftpdir}/. .
 }
diff --git a/config/debian/dinstall.variables b/config/debian/dinstall.variables
index c1b3b06c..d2cdfd1c 100644
--- a/config/debian/dinstall.variables
+++ b/config/debian/dinstall.variables
@@ -45,3 +45,6 @@ LOCK_BUILDD="$lockdir/buildd.lock"
 
 # Statefile for the users
 DINSTALLSTATE="${webdir}/dinstall.status"
+
+# The mirror trace file
+TRACEFILE="${ftpdir}/project/trace/ftp-master.debian.org"