config/debian/pointrelease

@@ -175,7 +175,16 @@ while :; do
 done
 
 log "Merging the ${pusuite}-debug into ${suite}-debug"
-dak control-suite --add ${suite}-debug < ${pusuite}-debug.list
+while :; do
+    if dak control-suite --add ${suite}-debug < ${pusuite}-debug.list; then
+        log "Done"
+        break
+    else
+        log "Please check problem and hit enter when i can retry"
+        read
+    fi
+done
+
 log "Cleaning ${pusuite} and ${pusuite}-debug"
 dak control-suite --remove ${pusuite} < ${pusuite}.list
 dak control-suite --remove ${pusuite}-debug < ${pusuite}-debug.list
@@ -421,7 +430,8 @@ merge-release-signatures() {
 merge-release-signatures $(get_archiveroot ftp-master) ${suite} Release.gpg Release Release-${newrev}.gpg
 merge-release-signatures $(get_archiveroot debian-debug) ${suite}-debug Release.gpg Release Release-${newrev}-debug.gpg
 if [ "${suitename}" = stretch ]; then
-    rm -f ${archiveroot}/dists/${suite}/InRelease ${archiveroot}/zzz-dists/${suite}/InRelease
+    rm -f $(get_archiveroot ftp-master)/dists/${suite}/InRelease $(get_archiveroot ftp-master)/zzz-dists/${suite}/InRelease
+    rm -f $(get_archiveroot debian-debug)/dists/${suite}-debug/InRelease $(get_archiveroot debian-debug)/zzz-dists/${suite}-debug/InRelease
 else
     merge-release-signatures $(get_archiveroot ftp-master) ${suite} InRelease "" InRelease-${newrev}.gpg
     merge-release-signatures $(get_archiveroot debian-debug) ${suite}-debug InRelease "" InRelease-${newrev}-debug.gpg