Really adapt these to new archive/suite definitions

diff --git a/config.sh b/config.sh
index a5aa6db59ba081fc431c0dfe37abc2f03b68cd6f..5c3a65e57f49248e30ca974b6bdfaf1bc5eadd90 100644 (file)
--- a/config.sh
+++ b/config.sh
@@ -47,10 +47,10 @@ cn_help_url="http://www.debian.org/intro/cn"
 #
 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 volatile backports"
+archives="us non-US security amd64 kfreebsd"
 sections="main contrib non-free"
 parts="$sections"
-suites="oldstable stable testing unstable experimental"
+suites="oldstable stable stable-volatile stable-backports testing unstable experimental"
 dists="$suites"
 architectures="alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel powerpc s390 sparc"
 arch_oldstable="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"

diff --git a/cron.d/100syncarchive_amd64 b/cron.d/100syncarchive_amd64
index 45754a49cf3e3b5a7bb7aa26f9f1c4587cc95c0c..087d6f79261381df01d725c2f995f8bfadaa3464 100755 (executable)
--- a/cron.d/100syncarchive_amd64
+++ b/cron.d/100syncarchive_amd64
@@ -14,12 +14,12 @@ for dist in stable testing unstable
   for part in ${parts} main/debian-installer
     do
     echo retrieve Packages $dist/$part/$arch
-    test -d us/${dist}/${part}/binary-${arch} || mkdir -p us/${dist}/${part}/binary-${arch}
-    (cd us/${dist}/${part}/binary-${arch} &&
+    test -d amd64/${dist}/${part}/binary-${arch} || mkdir -p amd64/${dist}/${part}/binary-${arch}
+    (cd amd64/${dist}/${part}/binary-${arch} &&
        wget -q -N ${amd64_ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
   done
   echo retrieve Contents $dist/$arch
-  (cd us/${dist} &&
+  (cd amd64/${dist} &&
       wget -q -N ${amd64_ftpsite}/dists/${dist}/Contents-${arch}.gz)
 done
 

diff --git a/cron.d/100syncarchive_backports b/cron.d/100syncarchive_backports
index 4ac478f9a62ef0db7c13b7e73d281a2c6cf03377..b482dc76dd123c3d4aeb1ef71a87d51ea6d81fde 100755 (executable)
--- a/cron.d/100syncarchive_backports
+++ b/cron.d/100syncarchive_backports
@@ -14,20 +14,20 @@ do
     do
       for part in ${parts}
       do
-       echo retrieve Packages $dist/$part/backports/$arch
-       test -d backports/${dist}-volatile/${part}/binary-${arch} || mkdir -p backports/${dist}-volatile/${part}/binary-${arch}
-       (cd backports/${dist}-volatile/${part}/binary-${arch} &&
+       echo retrieve Packages $dist-backports/$part/$arch
+       test -d us/${dist}-backports/${part}/binary-${arch} || mkdir -p us/${dist}-backports/${part}/binary-${arch}
+       (cd us/${dist}-backports/${part}/binary-${arch} &&
            wget -q -N ${backports_ftpsite}/dists/sarge-backports/${part}/binary-${arch}/Packages.gz)
       done
-      echo retrieve Contents $dist/$arch
-      (cd backports/${dist}-volatile &&
+      echo retrieve Contents $dist-backports/$arch
+      (cd us/${dist}-backports &&
          wget -q -N ${backports_ftpsite}/dists/sarge-backports/Contents-${arch}.gz)
     done
     for part in ${parts}
     do
-        echo retrieve Sources $dist/$part/backports
-        test -d backports/${dist}-volatile/${part}/source || mkdir -p backports/${dist}-volatile/${part}/source
-        (cd backports/${dist}-volatile/${part}/source &&
+        echo retrieve Sources $dist-backports/$part
+        test -d us/${dist}-backports/${part}/source || mkdir -p us/${dist}-backports/${part}/source
+        (cd us/${dist}-backports/${part}/source &&
             wget -q -N ${backports_ftpsite}/dists/sarge-backports/${part}/source/Sources.gz)
     done
 done

diff --git a/cron.d/100syncarchive_kfreebsd b/cron.d/100syncarchive_kfreebsd
index 9700f69bb8e6a8d532f183f1f197fd08ee3b594f..dff6cd29c4e2f237c9e13f607cf1cf6f72009dc2 100755 (executable)
--- a/cron.d/100syncarchive_kfreebsd
+++ b/cron.d/100syncarchive_kfreebsd
@@ -14,12 +14,12 @@ for dist in unstable experimental
   for part in ${parts} main/debian-installer
     do
     echo retrieve Packages $dist/$part/$arch
-    test -d us/${dist}/${part}/binary-${arch} || mkdir -p us/${dist}/${part}/binary-${arch}
-    (cd us/${dist}/${part}/binary-${arch} &&
+    test -d kfreebsd/${dist}/${part}/binary-${arch} || mkdir -p kfreebsd/${dist}/${part}/binary-${arch}
+    (cd kfreebsd/${dist}/${part}/binary-${arch} &&
        wget -q -N ${kfreebsd_ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
   done
   echo retrieve Contents $dist/$arch
-  (cd us/${dist} &&
+  (cd kfreebsd/${dist} &&
       wget -q -N ${kfreebsd_ftpsite}/dists/${dist}/Contents-${arch}.gz)
 done
 

diff --git a/cron.d/100syncarchive_volatile b/cron.d/100syncarchive_volatile
index 72a381edc325f05c8159c9ced583f48507339ee0..9fa2366c97d0d48f12086ac2abffbf048a40b1d6 100755 (executable)
--- a/cron.d/100syncarchive_volatile
+++ b/cron.d/100syncarchive_volatile
@@ -14,17 +14,17 @@ do
     do
       for part in ${parts}
       do
-       echo retrieve Packages $dist/$part/volatile/$arch
-       test -d volatile/${dist}-volatile/${part}/binary-${arch} || mkdir -p volatile/${dist}-volatile/${part}/binary-${arch}
-       (cd  volatile/${dist}-volatile/${part}/binary-${arch} &&
+       echo retrieve Packages $dist-volatile/$part/$arch
+       test -d us/${dist}-volatile/${part}/binary-${arch} || mkdir -p us/${dist}-volatile/${part}/binary-${arch}
+       (cd  us/${dist}-volatile/${part}/binary-${arch} &&
            wget -q -N ${volatile_ftpsite}/dists/${dist}/volatile/${part}/binary-${arch}/Packages.gz)
       done
     done
     for part in ${parts}
     do
-        echo retrieve Sources $dist/$part/volatile
-        test -d volatile/${dist}-volatile/${part}/source || mkdir -p volatile/${dist}-volatile/${part}/source
-        (cd volatile/${dist}/${part}-volatile/source &&
+        echo retrieve Sources $dist-volatile/$part
+        test -d us/${dist}-volatile/${part}/source || mkdir -p us/${dist}-volatile/${part}/source
+        (cd us/${dist}-volatile/$part/source &&
             wget -q -N ${volatile_ftpsite}/dists/${dist}/volatile/${part}/source/Sources.gz)
     done
 done