X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=8a5ec24e32c8ed8b12b18973221fba3519d26f9b;hb=dd06e01b323a8d5bd6130d80cb418647c856fa5a;hp=f4a23fbc85656c5ac0ed4718523a844595774dc5;hpb=efba553d4e61481d87f30626ceca2a86d2da5fff;p=dak.git

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index f4a23fbc..8a5ec24e 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -74,7 +74,7 @@ function i18n1() {
                 for dir in wheezy sid; do
                     if [ -d dists/${dir}/ ]; then
                         cd dists/${dir}/main/i18n
-                        rsync -aq --delete --delete-after --exclude Translation-en.bz2 . ${ftpdir}/dists/${dir}/main/i18n/.
+                        rsync -aq --delete --delete-after --exclude Translation-en.bz2 --exclude Translation-*.diff/ . ${ftpdir}/dists/${dir}/main/i18n/.
                     fi
                     cd ${scriptdir}/i18nsync
                 done
@@ -152,8 +152,6 @@ function mpfm() {
 
 function packages() {
     log "Generating Packages and Sources files"
-    #cd $configdir
-    #dak generate-packages-sources
     dak generate-packages-sources2
     dak contents generate
 }
@@ -404,7 +402,7 @@ function mirrorpush() {
                     # match.
                     continue
                 fi
-               broken=$(( broken + 1 ))
+                broken=$(( broken + 1 ))
                 echo "File ${subdir}/${NAME} is missing"
                 continue
             fi
@@ -446,9 +444,12 @@ function i18n2() {
     STAMP=$(date "+%Y%m%d%H%M")
     mkdir -p ${scriptdir}/i18n/${STAMP}
     cd ${scriptdir}/i18n/${STAMP}
-    dak control-suite -l stable > squeeze
-    dak control-suite -l testing > wheezy
-    dak control-suite -l unstable > sid
+    for suite in stable testing unstable; do
+        codename=$(dak admin s show ${suite}|grep '^Codename')
+        codename=${codename##* }
+        echo "Codename is ${codename}"
+        dak control-suite -l ${suite} >${codename}
+    done
     echo "${STAMP}" > timestamp
     gpg --secret-keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 55BE302B --detach-sign -o timestamp.gpg timestamp
     rm -f md5sum