X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config%2Fdebian%2Fdinstall.functions;h=f6287a8da7337a7aea5a2dcd0eb7a85f18779fba;hb=0b9068dfabb27498d868e61b9b7da0b9ecfc1349;hp=07295697caf4eae3062033aabec1a032e4555630;hpb=b07a6dc7c5bb60cc86a50558ed1a1e5a31cb63de;p=dak.git

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 07295697..f6287a8d 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -11,7 +11,7 @@ function remove_daily_lock() {
 
 # Remove all locks
 function remove_all_locks() {
-    rm -f $LOCK_DAILY $LOCK_ACCEPTED $LOCK_NEW
+    rm -f $LOCK_DAILY $LOCK_ACCEPTED
 }
 
 # If we error out this one is called, *FOLLOWED* by cleanup above
@@ -385,15 +385,15 @@ function mkfilesindices() {
 }
 
 function mkchecksums() {
-    local archiveroot
+    local archiveroot dsynclist md5list
 
     for archive in "${public_archives[@]}"; do
+        archiveroot="$(get_archiveroot "${archive}")"
         dsynclist=$dbdir/dsync.${archive}.list
-        md5list=$indices/md5sums
+        md5list=${archiveroot}/indices/md5sums
 
         log -n "Creating md5 / dsync index file for ${archive}... "
 
-        archiveroot="$(get_archiveroot "${archive}")"
         cd "$archiveroot"
         ${bindir}/dsync-flist -q generate $dsynclist --exclude $dsynclist --md5
         ${bindir}/dsync-flist -q md5sums $dsynclist | gzip -9n > ${md5list}.gz
@@ -616,10 +616,17 @@ EOF
 function changelogs() {
     log "Extracting changelogs"
     dak make-changelog -e -a ftp-master
+    [ -f ${exportdir}/changelogs/filelist.yaml ] && xz -f ${exportdir}/changelogs/filelist.yaml
     mkdir -p ${exportpublic}/changelogs
     cd ${exportpublic}/changelogs
     rsync -aHW --delete --delete-after --ignore-errors ${exportdir}/changelogs/. .
-    sudo -H -u archvsync /home/archvsync/runmirrors metaftpdo > ~dak/runmirrors-metadata.log 2>&1 &
+    sudo -H -u staticsync /usr/local/bin/static-update-component ftp-master.metadata.debian.org >/dev/null 2>&1 &
+
+    #dak make-changelog -e -a backports
+    #[ -f /srv/backports-master.debian.org/export/changelogs/filelist.yaml ] && xz -f /srv/backports-master.debian.org/export/changelogs/filelist.yaml
+    #mkdir -p /srv/backports-master.debian.org/rsync/export/changelogs
+    #cd /srv/backports-master.debian.org/rsync/export/changelogs
+    #rsync -aHW --delete --delete-after --ignore-errors /srv/backports-master.debian.org/export/changelogs/. .
 }
 
 function gitpdiff() {