X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config%2Fdebian%2Fdinstall.functions;h=2981c8c303d513bc223a2ff7d21c68ae00f1c58e;hb=d1b9fb11b2adefa328f8ea41c59b835e148c6f8e;hp=da158a47faa813c1738491cb518085398f98cc27;hpb=b488bb6a14c4376fb533a544d1c24d4ce74a0f5f;p=dak.git

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index da158a47..2981c8c3 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -171,6 +171,8 @@ function packages() {
     log "Generating Packages and Sources files"
     #cd $configdir
     #dak generate-packages-sources
+    # XXX: disable again later
+    dak generate-packages-sources2 --description-md5 -o Dir::Root=$webdir/newdists/
     dak generate-packages-sources2
     dak contents generate
 }
@@ -181,8 +183,14 @@ function pdiff() {
 }
 
 function release() {
+    # XXX: disable once we can remove i18n/Index (#649314)
+    log "Generating i18n/Index"
+    (cd "$ftpdir/dists"; for dist in testing unstable; do $scriptsdir/generate-i18n-Index $dist; done)
+    (cd "$webdir/newdists/dists"; for dist in testing unstable; do $scriptsdir/generate-i18n-Index $dist; done)
     log "Generating Release files"
     dak generate-releases
+    # XXX: disable again later
+    dak generate-releases -o Dir::Root=$webdir/newdists/
 }
 
 function dakcleanup() {
@@ -244,8 +252,9 @@ function copyoverrides() {
     log 'Copying override files into public view ...'
 
     for ofile in ${overridedir}/override.{lenny,squeeze,wheezy,sid}.{,extra.}{main,contrib,non-free}*; do
-        gzip -9v --rsyncable ${ofile} > ${indices}/${ofile}.gz
-        chmod g+w ${indices}/${ofile}.gz
+        bname=${ofile##*/}
+        gzip -9cv --rsyncable ${ofile} > ${indices}/${bname}.gz
+        chmod g+w ${indices}/${bname}.gz
     done
 }
 
@@ -405,7 +414,7 @@ function mirrorpush() {
         while read SHASUM SIZE NAME; do
             if ! [ -f "${subdir}/${NAME}" ]; then
                bname=$(basename ${NAME})
-                if [ "${bname}" = "Packages" ] || [ "${bname}" = "Sources" ]; then
+                if [[ "${bname}" =~ ^(Packages|Sources|Translation-[a-zA-Z_]+)$ ]]; then
                     # We don't keep unpacked files, don't check for their existance.
                     # We might want to go and check their unpacked shasum, but right now
                     # I don't care. I believe it should be enough if all the packed shasums