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

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index ffbbb545..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
 }
 
@@ -592,11 +579,11 @@ function gitpdiff() {
     # Also, we only want contents, packages and sources.
     for file in $(find ../dists/ -regex ".*/\(Contents-\($archs\)\|\(Packages\|Sources\)\).gz"); do
         log "${file}"
-        base=${file%%.gz};
-        base=${base##../};
-        dir=${base%/*};
+        basen=${file%%.gz};
+        basen=${basen##../};
+        dir=${basen%/*};
         mkdir -p $dir;
-        zcat $file > $foo;
+        zcat $file > $basen;
     done
 
     # Second, add all there is into git