[dak/master] Don't overwrite mirrordir variable
use the existing global one. Yes, this points to the
ftp-master.d.o/mirror dir. If an archives mirrordir really needs to be
elsewhere, symlink it.
---
config/debian/dinstall.functions | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index a0c362c..334d5e4 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -432,11 +432,10 @@ function mkchecksums() {
}
function mirror() {
- local archiveroot mirrordir targetpath TRACEFILE
+ local archiveroot targetpath TRACEFILE
for archive in "${public_archives[@]}"; do
archiveroot="$(get_archiveroot "${archive}")"
- mirrordir="${archiveroot}/../mirror"
targetpath="${mirrordir}/${archive}"
TRACEFILE="${archiveroot}/project/trace/ftp-master.debian.org"
mkdir -p "${archiveroot}/project/trace/"
@@ -491,12 +490,11 @@ function ddaccess() {
function mirrorpush() {
log "Checking the public archive copies..."
- local archiveroot mirrordir targetpath
+ local archiveroot targetpath
for archive in "${public_archives[@]}"; do
log "... archive: ${archive}"
archiveroot="$(get_archiveroot "${archive}")"
- mirrordir="${archiveroot}/../mirror"
targetpath="${mirrordir}/${archive}"
cd ${targetpath}/dists
--
2.1.4
Reply to: