From: Joerg Jaspert <joerg@debian.org>
Date: Thu, 5 Nov 2009 00:00:39 +0000 (+0100)
Subject: functions
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=b1d87e4799aa00b3544cd70d3cb185c055827c70;p=dak.git

functions

no longer call function scripts(), instead call them all on their own
also use cmp in a little more sane way

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index d72f9b46..03bb3648 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -322,8 +322,40 @@ GO=(
 stage $GO
 
 GO=(
-    FUNC="scripts"
-    TIME="scripts"
+    FUNC="mkmaintainers"
+    TIME="mkmaintainers"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
+GO=(
+    FUNC="copyoverrides"
+    TIME="copyoverrides"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
+GO=(
+    FUNC="mklslar"
+    TIME="mklslar"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
+GO=(
+    FUNC="mkfilesindices"
+    TIME="mkfilesindices"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
+GO=(
+    FUNC="mkchecksums"
+    TIME="mkchecksums"
     ARGS=""
     ERR=""
 )
diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 77ef651d..a948211c 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -248,54 +248,41 @@ function mklslar() {
 }
 
 function mkmaintainers() {
-    log -n 'Creating Maintainers index ... '
+    log 'Creating Maintainers index ... '
 
     cd $indices
     dak make-maintainers ${scriptdir}/masterfiles/pseudo-packages.maintainers | \
-        sed -e "s/~[^  ]*\([   ]\)/\1/"  | awk '{printf "%-20s ", $1; for (i=2; i<=NF; i++) printf "%s ", $i; printf "\n";}' > .new-maintainers
-
-    set +e
-    cmp .new-maintainers Maintainers >/dev/null
-    rc=$?
-    set -e
-    if [ $rc = 1 ] || [ ! -f Maintainers ] ; then
-	    log -n "installing Maintainers ... "
+        sed -e "s/~[^  ]*\([   ]\)/\1/"  | \
+        awk '{printf "%-20s ", $1; for (i=2; i<=NF; i++) printf "%s ", $i; printf "\n";}' > .new-maintainers
+
+    if ! cmp -s .new-maintainers Maintainers || [ ! -f Maintainers ]; then
+	    log "installing Maintainers ... "
 	    mv -f .new-maintainers Maintainers
 	    gzip --rsyncable -9v <Maintainers >.new-maintainers.gz
 	    mv -f .new-maintainers.gz Maintainers.gz
-    elif [ $rc = 0 ] ; then
-	    log '(same as before)'
-	    rm -f .new-maintainers
     else
-	    log cmp returned $rc
-	    false
+        rm -f .new-maintainers
     fi
 }
 
 function copyoverrides() {
     log 'Copying override files into public view ...'
 
-    for f in $copyoverrides ; do
+    for ofile in $copyoverrides ; do
 	    cd $overridedir
 	    chmod g+w override.$f
 
 	    cd $indices
-	    rm -f .newover-$f.gz
-	    pc="`gzip 2>&1 -9nv <$overridedir/override.$f >.newover-$f.gz`"
-	    set +e
-	    nf=override.$f.gz
-	    cmp -s .newover-$f.gz $nf
-	    rc=$?
-	    set -e
-        if [ $rc = 0 ]; then
-		    rm -f .newover-$f.gz
-	    elif [ $rc = 1 -o ! -f $nf ]; then
-		    log "   installing new $nf $pc"
-		    mv -f .newover-$f.gz $nf
-		    chmod g+w $nf
-	    else
-		    log $? $pc
-		    exit 1
+
+	    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
     done
 }
@@ -316,7 +303,7 @@ function mkfilesindices() {
         perl -e '@nonpool=(); while (<>) { if (m,^\./pool/,) { print; } else { push @nonpool, $_; } } print for (@nonpool);'
     }
 
-    log "Generating sources list
+    log "Generating sources list"
     (
         sed -n 's/|$//p' $ARCHLIST
         cd $base/ftp
@@ -324,7 +311,7 @@ function mkfilesindices() {
         find ./dists \! -type d | grep "/source/"
     ) | sort -u | gzip --rsyncable -9 > source.list.gz
 
-    log "Generating arch lists
+    log "Generating arch lists"
 
     ARCHES=$( (<$ARCHLIST sed -n 's/^.*|//p'; echo amd64) | grep . | grep -v all | sort -u)
     for a in $ARCHES; do
@@ -361,7 +348,6 @@ function mkfilesindices() {
     done
 
     log "Finding everything on the ftp site to generate sundries"
-
     (cd $base/ftp; find . \! -type d \! -name 'Archive_Maintenance_In_Progress' | sort) >$ARCHLIST
 
     rm -f sundries.list
@@ -401,15 +387,6 @@ function mkchecksums() {
     ${bindir}/dsync-flist -q link-dups $dsynclist || true
 }
 
-function scripts() {
-    log "Running various scripts from $scriptsdir"
-    mkmaintainers
-    copyoverrides
-    mklslar
-    mkfilesindices
-    mkchecksums
-}
-
 function mirror() {
     log "Regenerating \"public\" mirror/ hardlink fun"
     cd ${mirrordir}