From: Joerg Jaspert Date: Sat, 13 Aug 2011 21:36:07 +0000 (+0200) Subject: copyoverrides X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=b488bb6a14c4376fb533a544d1c24d4ce74a0f5f;p=dak.git copyoverrides make copyoverrides() function MUCH simpler and let it export all the overrides, it was missing stuff which let to problems with security archive. Signed-off-by: Joerg Jaspert --- diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index c4a25a61..da158a47 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -243,22 +243,9 @@ function mkmaintainers() { function copyoverrides() { log 'Copying override files into public view ...' - for ofile in $copyoverrides ; do - cd $overridedir - chmod g+w override.$ofile - - cd $indices - - newofile=override.$ofile.gz - rm -f .newover-$ofile.gz - pc="`gzip 2>&1 -9nv <$overridedir/override.$ofile >.newover-$ofile.gz`" - if ! cmp -s .newover-$ofile.gz $newofile || [ ! -f $newofile ]; then - log " installing new $newofile $pc" - mv -f .newover-$ofile.gz $newofile - chmod g+w $newofile - else - rm -f .newover-$ofile.gz - fi + 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 done } diff --git a/config/debian/vars b/config/debian/vars index 19dee850..cea5344f 100644 --- a/config/debian/vars +++ b/config/debian/vars @@ -30,8 +30,6 @@ exportpublic=$public/rsync/export/ ftpgroup=debadmin -copyoverrides="wheezy.contrib wheezy.contrib.src wheezy.main wheezy.main.src wheezy.non-free wheezy.non-free.src wheezy.extra.main wheezy.extra.non-free wheezy.extra.contrib wheezy.main.debian-installer sid.contrib sid.contrib.src sid.main sid.main.debian-installer sid.main.src sid.non-free sid.non-free.src sid.extra.contrib sid.extra.main sid.extra.non-free lenny.contrib lenny.contrib.src lenny.main lenny.main.src lenny.non-free lenny.non-free.src lenny.extra.main lenny.extra.contrib lenny.extra.non-free squeeze.contrib squeeze.contrib.src squeeze.main squeeze.main.src squeeze.non-free squeeze.non-free.src squeeze.extra.main squeeze.extra.contrib squeeze.extra.non-free" - TMPDIR=${base}/tmp PATH=$masterdir:$PATH