X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=8d7b6d1c432692208d0d041777f5b8bfec33c6ed;hb=e35de7a7441fcd49f49240352ccda01569d8a05b;hp=f43a0aa8e12c2c7a7e48b6680a04527257e77985;hpb=dacd1b7a65dedbfbedfc3ef2a8e9393e198ff806;p=dak.git

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index f43a0aa8..8d7b6d1c 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -111,10 +111,11 @@ function dep11() {
         for dir in stretch sid; do
             if [ -d ${dir}/ ]; then
                 for comp in main contrib non-free; do
-                    cd dists/${dir}/${comp}/dep11
+                    mkdir -p ${ftpdir}/dists/${dir}/${comp}/dep11
+                    cd ${dir}/${comp}
                     rsync -aq --delete --delete-after --exclude *.tmp . ${ftpdir}/dists/${dir}/${comp}/dep11/.
                     cd ${scriptdir}/dep11
-                fi
+                done
             fi
         done
     else
@@ -131,6 +132,7 @@ function cruft() {
 function dominate() {
     log "Removing obsolete source and binary associations"
     dak dominate
+    dak manage-debug-suites unstable-debug experimental-debug
 }
 
 function autocruft() {
@@ -437,7 +439,7 @@ function mirror() {
     # Ugly "hack", but hey, it does what we want.
     cp ${TRACEFILE} ${TRACEFILE_BDO}
 
-    for archive in "${public_archives[@]}"; do
+    for archive in ftp-master backports; do
         archiveroot="$(get_archiveroot "${archive}")"
         mirrordir="${archiveroot}/../mirror"
         cd ${mirrordir}
@@ -484,7 +486,8 @@ function mirrorpush() {
         while read SHASUM SIZE NAME; do
             if ! [ -f "${subdir}/${NAME}" ]; then
                bname=$(basename ${NAME})
-                if [[ "${bname}" =~ ^(Packages|Sources|Contents-[a-zA-Z0-9-]+|Translation-[a-zA-Z_]+)$ ]]; then
+               if [[ "${bname}" =~ ^(Packages|Sources|Contents-[a-zA-Z0-9-]+|Translation-[a-zA-Z_]+|Components-(amd64|i386)\.yml|icons-(128x128|64x64)\.tar)$ ]]; then
+
                     # We don't keep unpacked files, don't check for their existance.
                     # We might want to go and check their unpacked shasum, but right now
                     # I don't care. I believe it should be enough if all the packed shasums