[dak/master 4/4] Update dinstall for new makemaintainers.
Signed-off-by: Torsten Werner <twerner@debian.org>
---
config/debian/cron.dinstall | 8 --------
config/debian/dinstall.functions | 33 +++------------------------------
2 files changed, 3 insertions(+), 38 deletions(-)
diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 27200dd..c922683 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -335,14 +335,6 @@ GO=(
stage $GO
GO=(
- FUNC="mkuploaders"
- TIME="mkuploaders"
- ARGS=""
- ERR=""
-)
-stage $GO
-
-GO=(
FUNC="copyoverrides"
TIME="copyoverrides"
ARGS=""
diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index cac7c7c..d89aa48 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 <Maintainers >.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 <Uploaders >.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 >Maintainers.gz
+ gzip -9v --rsyncable <Uploaders >Uploaders.gz
}
function copyoverrides() {
--
1.7.2.5
Reply to: