X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=031cad1929fa9fdeb4dbec8c51b1563999adebf0;hb=3e915e5f51370eaef9d2c169818dd399b78a6ebc;hp=0040d719d6cc147ddb0969c3ce54665565d4aff4;hpb=472d5820d42930f33636df80275491f05df6e20d;p=dak.git

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 0040d719..031cad19 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -111,7 +111,8 @@ 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
                 done
@@ -437,7 +438,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 +485,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