From 756d6af6d756fb5c4ab2ba8de8b17e272c717c52 Mon Sep 17 00:00:00 2001
From: Gerfried Fuchs <rhonda@debian.org>
Date: Tue, 14 Jun 2011 10:35:07 +0200
Subject: [PATCH 1/1] dirty quickfix for main contents file, see #573797

---
 cron.d/100syncarchive           | 12 +++++++-----
 cron.d/100syncarchive_installer |  2 +-
 cron.d/120synctrans             |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index e47241d..7de8760 100755
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -49,8 +49,8 @@ else
     do
         echo "retrieve Releases(.gpg) $dist"
 	test -d us/${dist} || mkdir -p us/${dist}
-	rsync -t ${localdir}/dists/${dist}/Release us/${dist}/Release
-	rsync -t ${localdir}/dists/${dist}/Release.gpg us/${dist}/Release.gpg
+	rsync -Lt ${localdir}/dists/${dist}/Release us/${dist}/Release
+	rsync -Lt ${localdir}/dists/${dist}/Release.gpg us/${dist}/Release.gpg
 
 	foo=\$arch_${dist//-/_}
 	for arch in `eval echo $foo`
@@ -59,19 +59,21 @@ else
 	    do
 	        echo retrieve Packages $dist/$part/$arch
 		test -d us/${dist}/${part}/binary-${arch} || mkdir -p us/${dist}/${part}/binary-${arch}
-		rsync -t ${localdir}/dists/${dist}/${part}/binary-${arch}/Packages.gz \
+		rsync -Lt ${localdir}/dists/${dist}/${part}/binary-${arch}/Packages.gz \
 		    us/${dist}/${part}/binary-${arch}/Packages.gz
 	    done
 	    #FIXME: no Contents files for p-u
+	    #FIXME: the symlinks for wheezy/sid/experimental will go away
+	    #FIXME: this only pulls in the contents files for main in wheezy/sid/experimental
 	    echo retrieve Contents $dist/$arch
-	    rsync -t ${localdir}/dists/${dist}/Contents-${arch}.gz \
+	    rsync -Lt ${localdir}/dists/${dist}/Contents-${arch}.gz \
 		us/${dist}/Contents-${arch}.gz
 	done
 	for part in ${parts}
         do
 	    echo retrieve Sources $dist/$part
             test -d us/${dist}/${part}/source || mkdir -p us/${dist}/${part}/source
-            rsync -t ${localdir}/dists/${dist}/${part}/source/Sources.gz \
+            rsync -Lt ${localdir}/dists/${dist}/${part}/source/Sources.gz \
 	    	us/${dist}/${part}/source/Sources.gz
 	done
 
diff --git a/cron.d/100syncarchive_installer b/cron.d/100syncarchive_installer
index b938895..996d46f 100755
--- a/cron.d/100syncarchive_installer
+++ b/cron.d/100syncarchive_installer
@@ -41,7 +41,7 @@ else
 		part="$part/debian-installer"
 	        echo retrieve Sources $dist/$part/$arch
 		test -d us/${dist}/${part}/binary-${arch} || mkdir -p us/${dist}/${part}/binary-${arch}
-		rsync -t ${localdir}/dists/${dist}/${part}/binary-${arch}/Packages.gz \
+		rsync -Lt ${localdir}/dists/${dist}/${part}/binary-${arch}/Packages.gz \
 		    us/${dist}/${part}/binary-${arch}/Packages.gz
 	    done
 	done
diff --git a/cron.d/120synctrans b/cron.d/120synctrans
index bd3e31d..b97659e 100755
--- a/cron.d/120synctrans
+++ b/cron.d/120synctrans
@@ -37,7 +37,7 @@ else
 	  do
 	    locale=$(echo $lang|perl -p -e 's/^([a-z]{2})-([a-z]{2})$/"$1_".uc($2)/e')
 	    echo "retrieve translated Descs $dist/$part/$lang ($locale)"
-            rsync -t ${localdir}/dists/${dist}/${part}/i18n/Translation-$locale.bz2 \
+            rsync -Lt ${localdir}/dists/${dist}/${part}/i18n/Translation-$locale.bz2 \
 	    	us/${dist}/${part}/i18n/Translation-$locale.bz2
 	  done
 	done
-- 
2.39.2