non-US: don't download anymore

Don't try to download any non-US information anymore.
Don't delete the various non-US hacks from the parsing and displaying
code yet. This can be done as a second step.

diff --git a/config.sh.sed.in b/config.sh.sed.in
index c881b993ac8c0b1401ae8e9b7d7156e1e0d20d1d..7addf96566fad13c2fab6e5e831554e150f1d266 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -40,7 +40,7 @@ root=""
 #
 polangs="de fi nl fr uk"
 ddtplangs="de cs da eo es fi fr hu it ja nl pl pt_BR pt_PT ru sk sv_SE uk"
 #
 polangs="de fi nl fr uk"
 ddtplangs="de cs da eo es fi fr hu it ja nl pl pt_BR pt_PT ru sk sv_SE uk"

-archives="us non-US security amd64 kfreebsd backports volatile"
+archives="us security amd64 kfreebsd backports volatile"

 sections="main contrib non-free"
 parts="$sections"
 suites="oldstable stable stable-volatile stable-backports testing unstable experimental"
 sections="main contrib non-free"
 parts="$sections"
 suites="oldstable stable stable-volatile stable-backports testing unstable experimental"

diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index 46da47ff17156c9194ddde657d85963f083df917..55589d853d55b9a9c7c8228a11000cb1a918082d 100755 (executable)
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -80,34 +80,6 @@ else
     done
 fi
 
     done
 fi
 

-# Non-US archive
-#
-for dist in oldstable
-do
-    foo=\$arch_${dist//-/_}
-    for arch in `eval echo $foo`
-    do
-       for part in ${parts}
-       do
-           echo retrieve Packages $dist/$part/non-US/$arch
-           test -d non-US/${dist}/${part}/binary-${arch} || mkdir -p non-US/${dist}/${part}/binary-${arch}
-           (cd non-US/${dist}/${part}/binary-${arch} &&
-               wget -q -N ${nonus_ftpsite}/dists/${dist}/non-US/${part}/binary-${arch}/Packages.gz)
-       done
-       #FIXME: no Contents files for p-u
-       echo retrieve Contents $dist/non-US/$arch
-       (cd non-US/${dist} &&
-           wget -q -N ${nonus_ftpsite}/dists/${dist}/non-US/Contents-${arch}.gz)
-    done
-    for part in ${parts}
-    do
-        echo retrieve Sources $dist/$part/non-US
-       test -d non-US/${dist}/${part}/source || mkdir -p non-US/${dist}/${part}/source
-       (cd non-US/${dist}/${part}/source &&
-           wget -q -N ${nonus_ftpsite}/dists/${dist}/non-US/${part}/source/Sources.gz)
-    done
-done
-

 # security archive
 #
 for dist in oldstable stable testing
 # security archive
 #
 for dist in oldstable stable testing