X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=63a2653009eaec62bbf193356b19903d79964d10;hb=356f4f93a9d0b29c0878111f7c3eee194f6571e5;hp=761c7249e745f565bab0180351dd8f5e7b75d2dd;hpb=e31570b80732a4fb1d1ea8ed3e18d2ba7330b40c;p=dak.git

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 761c7249..63a26530 100755
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -117,7 +117,7 @@ function i18n1() {
                 for dir in ${extimportdists}; do
                     if [[ -d dists/${dir}/  ]]; then
                         cd dists/${dir}/main/i18n
-                        rsync -aq --delete --delete-after --exclude Translation-en.bz2 --exclude Translation-*.diff/ . ${ftpdir}/dists/${dir}/main/i18n/.
+                        rsync -aq --delete --delete-after --exclude by-hash --exclude Translation-en.bz2 --exclude "Translation-*.diff/" . ${ftpdir}/dists/${dir}/main/i18n/.
                     fi
                     cd ${scriptdir}/i18nsync
                 done
@@ -152,7 +152,7 @@ function dep11() {
                 for comp in main contrib non-free; do
                     mkdir -p ${ftpdir}/dists/${dir}/${comp}/dep11
                     cd ${dir}/${comp}
-                    rsync -aq --delete --delete-after --exclude ./*.tmp . ${ftpdir}/dists/${dir}/${comp}/dep11/.
+                    rsync -aq --delete --delete-after --exclude by-hash --exclude "./*.tmp" . ${ftpdir}/dists/${dir}/${comp}/dep11/.
                     cd ${dep11dir}
                 done
             fi
@@ -491,7 +491,7 @@ function mirror() {
 
         mkdir -p ${targetpath}
         cd ${targetpath}
-        rsync -aH --link-dest ${archiveroot} --delete --delete-after --delete-excluded --exclude Packages.*.new --exclude Sources.*.new  --ignore-errors ${archiveroot}/. .
+        rsync -aH --link-dest ${archiveroot} --delete --delete-after --delete-excluded --exclude "Packages.*.new" --exclude "Sources.*.new"  --ignore-errors ${archiveroot}/. .
     done
 }
 
@@ -535,7 +535,7 @@ 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_]+|Components-[a-zA-Z0-9-]\.yml|icons-(128x128|64x64)\.tar)$ ]]; then
+                    if [[ "${bname}" =~ ^(Packages|Sources|Contents-[a-zA-Z0-9-]+|Translation-[a-zA-Z_]+|Components-[a-zA-Z0-9-]+\.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
@@ -606,6 +606,11 @@ function mirrorpush-backports() {
     sudo -u backports /home/backports/bin/update-archive
 }
 
+function mirrorpush-release() {
+    log "Pushing cdbuilder host"
+    sudo -H -u archvsync /home/archvsync/runmirrors release > ~dak/runmirrors-release.log 2>&1 &
+}
+
 function i18n2() {
     log "Exporting package data foo for i18n project"
     STAMP=$(date "+%Y%m%d%H%M")
@@ -687,11 +692,11 @@ function changelogs() {
         rsync -aHW --delete --delete-after --ignore-errors ${exportdir}/changelogs/. .
         sudo -H -u staticsync /usr/local/bin/static-update-component metadata.ftp-master.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/. .
+        # 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/. .
         remove_changelog_lock
     fi
 }