From: Torsten Werner Date: Thu, 24 Mar 2011 20:54:31 +0000 (+0100) Subject: Update dinstall for new makemaintainers. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=379483e06229476e235f7a8199f1e74c2c4ba0cb;p=dak Update dinstall for new makemaintainers. Signed-off-by: Torsten Werner --- diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall index 27200dd1..c922683b 100755 --- a/config/debian/cron.dinstall +++ b/config/debian/cron.dinstall @@ -334,14 +334,6 @@ GO=( ) stage $GO -GO=( - FUNC="mkuploaders" - TIME="mkuploaders" - ARGS="" - ERR="" -) -stage $GO - GO=( FUNC="copyoverrides" TIME="copyoverrides" diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index cac7c7c5..d89aa483 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -235,36 +235,9 @@ function mkmaintainers() { 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 - - if ! cmp -s .new-maintainers Maintainers || [ ! -f Maintainers ]; then - log "installing Maintainers ... " - mv -f .new-maintainers Maintainers - gzip -9v .new-maintainers.gz - mv -f .new-maintainers.gz Maintainers.gz - else - rm -f .new-maintainers - fi -} - -function mkuploaders() { - log 'Creating Uploaders index ... ' - - cd $indices - dak make-maintainers -u ${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-uploaders - - if ! cmp -s .new-uploaders Uploaders || [ ! -f Uploaders ]; then - log "installing Uploaders ... " - mv -f .new-uploaders Uploaders - gzip -9v .new-uploaders.gz - mv -f .new-uploaders.gz Uploaders.gz - else - rm -f .new-uploaders - fi + dak make-maintainers ${scriptdir}/masterfiles/pseudo-packages.maintainers + gzip -9v --rsyncable Maintainers.gz + gzip -9v --rsyncable Uploaders.gz } function copyoverrides() {