Merge lp:~launchpad-baby-gnu/ubumirror/fix-delete-debs-after-dists-sync into lp:ubumirror

[Daniel Dehennin]

If the deletion of deb file fails, for example if number of files to delete exceed --max-delete, the repository finish in incoherent state.

This patch move the deb file deletion after the synchronisation of indexes.

Unmerged revisions

84. By Daniel Dehennin <email address hidden> on 2015-12-04

Delete debs after dists/ synchronisation

If the deletion fails, for example if number of files to delete exceed
--max-delete, the repository finish in incoherent state.

=== modified file 'ubuarchive'
--- ubuarchive	2014-06-08 05:58:41 +0000
+++ ubuarchive	2015-12-04 14:55:30 +0000
@@ -65,7 +65,7 @@
 set +e
 echo "$(date -R): Initiating Ubuntu archive pool sync..."
 
-rsync -av --partial --delete --delete-after \
+rsync -av --partial \
       --timeout=$IO_TIMEOUT \
       --bwlimit=$SPEED \
       --exclude "indices/" --exclude "dists/" --exclude "project/trace/${HOSTNAME}" \
@@ -84,10 +84,10 @@
 
 echo "$(date -R): Initiating Ubuntu archive dists and indices sync..."
 
-rsync -av --partial --delete --delete-after \
+rsync -av --partial --delete --delete-after --delay-updates \
       --timeout=$IO_TIMEOUT  \
       --bwlimit=$SPEED \
-      --exclude "pool/" --exclude "project/trace/${HOSTNAME}" \
+      --exclude "project/trace/${HOSTNAME}" \
       --exclude "Archive-Update-in-Progress-${HOSTNAME}" \
       $UBUARC_EXCLUDE \
       $UBUARC_MIRROR $UBUARC_DIR