fedora and fedora-epel: abusing DESTD to limit scope and hopefully appease rsync

diff --git a/fetch-scripts/fedora b/fetch-scripts/fedora
index 0c9ec4025b974db1a53ffea41f300ed49cc3e3a0..e161eba7b751c29b42b51095ca3330fbc6435c3e 100644 (file)
--- a/fetch-scripts/fedora
+++ b/fetch-scripts/fedora
@@ -9,8 +9,14 @@ PREBITFLIP=1
 # The remote module we want to sync from fedora-buffet[0].
 # Some call it fedora, others call it fedora-enchilada.
 MODULE=fedora
-# The local name for it.
-MODULEDIR=fedora
+
+# Normally, quick-fedora-mirror is used to mirror multiple modules,
+# and wants DESTD to point at the root. However, we're using it for
+# single modules, and it seems to choke on the symlink farm.
+# Setting DESTD to the module location and forcing telling qfm to
+# put the module in `.`.
+
+DESTD="${MIRRORDIR}/fedora"
 
 TIMEFILE="${MIRRORDIR}/.locks/fedora.timefile"
 QFM="./tools/fedora/quick-fedora-mirror"
@@ -33,7 +39,7 @@ CONF="${TMPDIR}/qfm.conf"
 cat >"${CONF}" <<EOF
 # This will be sourced by qfm, which uses zsh.
 # Where our mirrors live
-DESTD=${MIRRORDIR}
+DESTD=${DESTD}
 # State regarding last sync, and also a lockfile for qfm
 TIMEFILE=${TIMEFILE}
 # Upstream mirror that contains MASTERMODULE
@@ -42,8 +48,8 @@ MASTERMODULE=${MASTERMODULE}
 PREBITFLIP=${PREBITFLIP}
 # Which module to sync
 MODULES=(${MODULE})
-# Map from module to location in DESTD
-MODULEMAPPING=(${MODULE} ${MODULEDIR})
+# Map from module to location; which we're forcing to .
+MODULEMAPPING=(${MODULE} .)
 # One -v to rsync
 VERBOSE=4
 EOF

diff --git a/fetch-scripts/fedora-epel b/fetch-scripts/fedora-epel
index 38635216e90c02acfe7f9bad7df2f3a19eba2630..fb1276e3417b46d58a5db6b5a8e9ca8a510250a0 100644 (file)
--- a/fetch-scripts/fedora-epel
+++ b/fetch-scripts/fedora-epel
@@ -9,8 +9,14 @@ PREBITFLIP=1
 # The remote module we want to sync from fedora-buffet[0].
 # Some call it epel, others call it fedora-epel.
 MODULE=epel
-# The local name for it.
-MODULEDIR=epel
+
+# Normally, quick-fedora-mirror is used to mirror multiple modules,
+# and wants DESTD to point at the root. However, we're using it for
+# single modules, and it seems to choke on the symlink farm.
+# Setting DESTD to the module location and forcing telling qfm to
+# put the module in `.`.
+
+DESTD="${MIRRORDIR}/epel"
 
 TIMEFILE="${MIRRORDIR}/.locks/fedora-epel.timefile"
 QFM="./tools/fedora/quick-fedora-mirror"
@@ -33,7 +39,7 @@ CONF="${TMPDIR}/qfm.conf"
 cat >"${CONF}" <<EOF
 # This will be sourced by qfm, which uses zsh.
 # Where our mirrors live
-DESTD=${MIRRORDIR}
+DESTD=${DESTD}
 # State regarding last sync, and also a lockfile for qfm
 TIMEFILE=${TIMEFILE}
 # Upstream mirror that contains MASTERMODULE
@@ -42,8 +48,8 @@ MASTERMODULE=${MASTERMODULE}
 PREBITFLIP=${PREBITFLIP}
 # Which module to sync
 MODULES=(${MODULE})
-# Map from module to location in DESTD
-MODULEMAPPING=(${MODULE} ${MODULEDIR})
+# Map from module to location; which we're forcing to .
+MODULEMAPPING=(${MODULE} .)
 # One -v to rsync
 VERBOSE=4
 EOF