$base/dak/tools/removals.pl $configdir/removalsrss.rc > $webdir/removals.rss
#$scriptsdir/generate-di
+
+# do the buildd key updates
+BUILDDFUN=$(mktemp -p "${TMPDIR}" BUILDDFUN.XXXXXX)
+exec >> "${BUILDDFUN}" 2>&1
+#${scriptsdir}/buildd-remove-keys
+#${scriptsdir}/buildd-add-keys
+#${scriptsdir}/buildd-prepare-dir
+for keyring in $(dak admin k list-binary); do
+ dak import-keyring --generate-users "%s" ${keyring}
+done
+exec >>/dev/null 2>&1
+
+DATE=$(date -Is)
+cat "${BUILDDFUN}" | mail -a "X-Debian: DAK" -e -s "[$(hostname -s)] Buildd key changes ${DATE}" buildd-keys@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
+
+rm -f "${BUILDDFUN}"
--- /dev/null
+#! /bin/bash
+#
+# Executed hourly via cron, out of dak's crontab.
+
+set -e
+set -u
+
+export SCRIPTVARS=/srv/security-master.debian.org/dak/config/debian-security/vars
+. $SCRIPTVARS
+
+dak import-users-from-passwd
+# dak queue-report -n > $webdir/new.html
+# dak queue-report -8 -d new,byhand,proposedupdates,oldproposedupdates -r $webdir/stat
+# dak show-deferred -r $webdir/stat > ${webdir}/deferred.html
+# dak graph -n new,byhand,proposedupdates,oldproposedupdates,deferred -r $webdir/stat -i $webdir/stat -x $scriptsdir/rrd-release-freeze-dates
+# dak show-new > /dev/null
+
+# cd $webdir
+# cat removals-20*.txt > removals-full.txt
+# cat removals.txt >> removals-full.txt
+# cat removals-20*.822 > removals-full.822
+# cat removals.822 >> removals-full.822
+
+#$base/dak/tools/queue_rss.py -q $queuedir/new -o $webdir/rss/ -d $base/misc -l $base/log/
+#$base/dak/tools/removals.pl $configdir/removalsrss.rc > $webdir/removals.rss
+
+#$scriptsdir/generate-di
+
+# do the buildd key updates
+BUILDDFUN=$(mktemp -p "${TMPDIR}" BUILDDFUN.XXXXXX)
+exec >> "${BUILDDFUN}" 2>&1
+#${scriptsdir}/buildd-remove-keys
+#${scriptsdir}/buildd-add-keys
+#${scriptsdir}/buildd-prepare-dir
+for keyring in $(dak admin k list-binary); do
+ dak import-keyring --generate-users "%s" ${keyring}
+done
+exec >>/dev/null 2>&1
+
+DATE=$(date -Is)
+cat "${BUILDDFUN}" | mail -a "X-Debian: DAK" -e -s "[$(hostname -s)] Buildd key changes ${DATE}" buildd-keys@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
+
+rm -f "${BUILDDFUN}"
$base/dak/tools/queue_rss.py -q $queuedir/new -o $webdir/rss/ -d $base/misc -l $base/log/
$base/dak/tools/removals.pl $configdir/removalsrss.rc > $webdir/rss/removals.rss
+
# Tell ries to sync its tree
ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30 -2 -i ${base}/s3kr1t/pushddmirror dak@ries.debian.org sync
$scriptsdir/generate-di
+
+
+# do the buildd key updates
+BUILDDFUN=$(mktemp -p "${TMPDIR}" BUILDDFUN.XXXXXX)
+exec >> "${BUILDDFUN}" 2>&1
+${scriptsdir}/buildd-remove-keys
+${scriptsdir}/buildd-add-keys
+${scriptsdir}/buildd-prepare-dir
+
+for keyring in $(dak admin k list-binary); do
+ dak import-keyring --generate-users "%s" ${keyring}
+done
+exec >>/dev/null 2>&1
+
+DATE=$(date -Is)
+cat "${BUILDDFUN}" | mail -a "X-Debian: DAK" -e -s "[$(hostname -s)] Buildd key changes ${DATE}" buildd-keys@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
+
+rm -f "${BUILDDFUN}"
"Generate Release files"),
("generate-packages-sources",
"Generate Packages/Sources files"),
+ ("generate-packages-sources2",
+ "Generate Packages/Sources files [directly from database]"),
("contents",
"Generate content files"),
("metadata",
--- /dev/null
+#!/usr/bin/env python
+# coding=utf8
+
+"""
+Drop unused view bin_assoc_by_arch.
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2011 Torsten Werner <twerner@debian.org>
+@license: GNU General Public License version 2 or later
+"""
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+################################################################################
+
+import psycopg2
+from daklib.dak_exceptions import DBUpdateError
+from socket import gethostname;
+
+################################################################################
+def do_update(self):
+ """
+ Drop unused view bin_assoc_by_arch.
+ """
+ print __doc__
+ try:
+ c = self.db.cursor()
+
+ c.execute("""
+ DROP VIEW bin_assoc_by_arch""")
+
+ c.execute("UPDATE config SET value = '55' WHERE name = 'db_revision'")
+ self.db.commit()
+
+ except psycopg2.ProgrammingError, msg:
+ self.db.rollback()
+ raise DBUpdateError, 'Unable to apply sick update 55, rollback issued. Error message : %s' % (str(msg))
--- /dev/null
+#!/usr/bin/env python
+# coding=utf8
+
+"""
+Add order column to metadata_keys
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2011 Ansgar Burchardt <ansgar@debian.org>
+@license: GNU General Public License version 2 or later
+"""
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+################################################################################
+
+import psycopg2
+from daklib.dak_exceptions import DBUpdateError
+
+################################################################################
+def do_update(self):
+ """
+ Add order column to metadata_keys
+ """
+ print __doc__
+ try:
+ c = self.db.cursor()
+
+ c.execute("ALTER TABLE metadata_keys ADD COLUMN order INTEGER NOT NULL DEFAULT 0")
+
+ initial_order = {
+ 'Package': -2600,
+ 'Source': -2500,
+ 'Binary': -2400,
+ 'Version': -2300,
+ 'Essential': -2250,
+ 'Installed-Size': -2200,
+ 'Maintainer': -2100,
+ 'Uploaders': -2090,
+ 'Original-Maintainer': -2080,
+ 'Build-Depends': -2000,
+ 'Build-Depends-Indep': -1990,
+ 'Build-Conflicts': -1980,
+ 'Build-Conflicts-Indep': -1970,
+ 'Architecture': -1800,
+ 'Standards-Version': -1700,
+ 'Format': -1600,
+ 'Files': -1500,
+ 'DM-Upload-Allowed': -1400,
+ 'Vcs-%': -1300,
+ 'Checksums-%': -1200,
+ 'Replaces': -1100,
+ 'Provides': -1000,
+ 'Depends': -900,
+ 'Pre-Depends': -850,
+ 'Recommends': -800,
+ 'Suggests': -700,
+ 'Enhances': -650,
+ 'Conflicts': -600,
+ 'Breaks': -500,
+ 'Description': -400,
+ 'Origin': -300,
+ 'Bugs': -200,
+ 'Multi-Arch': -150,
+ 'Homepage': -100,
+ 'Tag': 300,
+ 'Package-Type': 400,
+ 'Installer-Menu-Item': 500,
+ }
+
+ for key, order in initial_order.items():
+ c.execute("""UPDATE metadata_keys SET "order" = '%s' WHERE key ILIKE '%s'""" % (order, key))
+
+ c.execute("UPDATE config SET value = '56' WHERE name = 'db_revision'")
+ self.db.commit()
+
+ except psycopg2.ProgrammingError, msg:
+ self.db.rollback()
+ raise DBUpdateError, 'Unable to apply sick update 56, rollback issued. Error message : %s' % (str(msg))
--- /dev/null
+#!/usr/bin/python
+
+"""
+Generate Packages/Sources files
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2011 Ansgar Burchardt <ansgar@debian.org>
+@copyright: Based on daklib/lists.py and dak/generate_filelist.py:
+ 2009-2011 Torsten Werner <twerner@debian.org>
+@copyright: Based on dak/generate_packages_sources.py:
+ 2000, 2001, 2002, 2006 James Troup <james@nocrew.org>
+ 2009 Mark Hymers <mhy@debian.org>
+ 2010 Joerg Jaspert <joerg@debian.org>
+@license: GNU General Public License version 2 or later
+"""
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+from daklib.dbconn import *
+from daklib.config import Config
+from daklib import utils, daklog
+from multiprocessing import Pool
+import apt_pkg, os, stat, sys
+
+def usage():
+ print """Usage: dak generate-packages-sources2 [OPTIONS]
+Generate the Packages/Sources files
+
+ -s, --suite=SUITE process this suite
+ Default: All suites not marked 'untouchable'
+ -f, --force Allow processing of untouchable suites
+ CAREFUL: Only to be used at point release time!
+ -h, --help show this help and exit
+
+SUITE can be a space seperated list, e.g.
+ --suite=unstable testing
+"""
+ sys.exit()
+
+#############################################################################
+
+# Here be dragons.
+_sources_query = R"""
+SELECT
+
+ (SELECT
+ STRING_AGG(
+ CASE
+ WHEN key = 'Source' THEN 'Package\: '
+ WHEN key = 'Files' THEN E'Files\:\n ' || f.md5sum || ' ' || f.size || ' ' || SUBSTRING(f.filename FROM E'/([^/]*)\\Z')
+ WHEN key = 'Checksums-Sha1' THEN E'Checksums-Sha1\:\n ' || f.sha1sum || ' ' || f.size || ' ' || SUBSTRING(f.filename FROM E'/([^/]*)\\Z')
+ WHEN key = 'Checksums-Sha256' THEN E'Checksums-Sha256\:\n ' || f.sha256sum || ' ' || f.size || ' ' || SUBSTRING(f.filename FROM E'/([^/]*)\\Z')
+ ELSE key || '\: '
+ END || value, E'\n' ORDER BY mk.order, mk.key)
+ FROM
+ source_metadata sm
+ JOIN metadata_keys mk ON mk.key_id = sm.key_id
+ WHERE s.id=sm.src_id
+ )
+ ||
+ E'\nDirectory\: pool/' || SUBSTRING(f.filename FROM E'\\A(.*)/[^/]*\\Z')
+ ||
+ E'\nPriority\: ' || pri.priority
+ ||
+ E'\nSection\: ' || sec.section
+
+FROM
+
+source s
+JOIN src_associations sa ON s.id = sa.source
+JOIN files f ON s.file=f.id
+JOIN override o ON o.package = s.source
+JOIN section sec ON o.section = sec.id
+JOIN priority pri ON o.priority = pri.id
+
+WHERE
+ sa.suite = :suite
+ AND o.suite = :suite AND o.component = :component AND o.type = :dsc_type
+
+ORDER BY
+s.source, s.version
+"""
+
+def open_sources(suite, component):
+ cnf = Config()
+ dest = os.path.join(cnf['Dir::Root'], 'dists', suite.suite_name, component.component_name, 'source', 'Sources')
+
+ # create queue if it does not exist yet
+ if os.path.exists(dest) and os.path.isdir(dest):
+ dest_dir = dest
+ else:
+ dest_dir = os.path.dirname(dest)
+ if not os.path.exists(dest_dir):
+ umask = os.umask(00000)
+ os.makedirs(dest_dir, 02775)
+ os.umask(umask)
+
+ f = open(dest, 'w')
+ return f
+
+def generate_sources(suite_id, component_id):
+ global _sources_query
+
+ session = DBConn().session()
+ dsc_type = session.query(OverrideType).filter_by(overridetype='dsc').one().overridetype_id
+
+ suite = session.query(Suite).get(suite_id)
+ component = session.query(Component).get(component_id)
+
+ output = open_sources(suite, component)
+
+ # run query and write Sources
+ r = session.execute(_sources_query, {"suite": suite_id, "component": component_id, "dsc_type": dsc_type})
+ for (stanza,) in r:
+ print >>output, stanza
+ print >>output, ""
+
+ return ["generate sources", suite.suite_name, component.component_name]
+
+#############################################################################
+
+# Here be large dragons.
+_packages_query = R"""
+WITH
+
+ tmp AS (
+ SELECT
+ b.id AS binary_id,
+ b.package AS package,
+ b.version AS version,
+ b.architecture AS architecture,
+ b.source AS source_id,
+ s.source AS source,
+ f.filename AS filename,
+ f.size AS size,
+ f.md5sum AS md5sum,
+ f.sha1sum AS sha1sum,
+ f.sha256sum AS sha256sum
+ FROM
+ binaries b
+ JOIN bin_associations ba ON b.id = ba.bin
+ JOIN files f ON f.id = b.file
+ JOIN location l ON l.id = f.location
+ JOIN source s ON b.source = s.id
+ WHERE
+ (b.architecture = :arch_all OR b.architecture = :arch) AND b.type = :type_name
+ AND ba.suite = :suite
+ AND l.component = :component
+ )
+
+SELECT
+ (SELECT
+ STRING_AGG(key || '\: ' || value, E'\n' ORDER BY mk.order, mk.key)
+ FROM
+ binaries_metadata bm
+ JOIN metadata_keys mk ON mk.key_id = bm.key_id
+ WHERE
+ bm.bin_id = tmp.binary_id
+ AND key != 'Section' AND key != 'Priority'
+ )
+ || E'\nSection\: ' || sec.section
+ || E'\nPriority\: ' || pri.priority
+ || E'\nFilename\: pool/' || tmp.filename
+ || E'\nSize\: ' || tmp.size
+ || E'\nMD5sum\: ' || tmp.md5sum
+ || E'\nSHA1\: ' || tmp.sha1sum
+ || E'\nSHA256\: ' || tmp.sha256sum
+
+FROM
+ tmp
+ JOIN override o ON o.package = tmp.package
+ JOIN section sec ON sec.id = o.section
+ JOIN priority pri ON pri.id = o.priority
+
+WHERE
+ (
+ architecture <> :arch_all
+ OR
+ (architecture = :arch_all AND source_id IN (SELECT source_id FROM tmp WHERE architecture <> :arch_all))
+ OR
+ (architecture = :arch_all AND source NOT IN (SELECT DISTINCT source FROM tmp WHERE architecture <> :arch_all))
+ )
+ AND
+ o.type = :type_id AND o.suite = :suite AND o.component = :component
+
+ORDER BY tmp.package, tmp.version
+"""
+
+def open_packages(suite, component, architecture, type_name):
+ cnf = Config()
+ if type_name == 'udeb':
+ dest = os.path.join(cnf['Dir::Root'], 'dists', suite.suite_name, component.component_name, 'debian-installer', 'binary-%s' % architecture.arch_string, 'Packages')
+ else:
+ dest = os.path.join(cnf['Dir::Root'], 'dists', suite.suite_name, component.component_name, 'binary-%s' % architecture.arch_string, 'Packages')
+
+ # create queue if it does not exist yet
+ if os.path.exists(dest) and os.path.isdir(dest):
+ dest_dir = dest
+ else:
+ dest_dir = os.path.dirname(dest)
+ if not os.path.exists(dest_dir):
+ umask = os.umask(00000)
+ os.makedirs(dest_dir, 02775)
+ os.umask(umask)
+
+ f = open(dest, 'w')
+ return f
+
+def generate_packages(suite_id, component_id, architecture_id, type_name):
+ global _packages_query
+
+ session = DBConn().session()
+ arch_all_id = session.query(Architecture).filter_by(arch_string='all').one().arch_id
+ type_id = session.query(OverrideType).filter_by(overridetype=type_name).one().overridetype_id
+
+ suite = session.query(Suite).get(suite_id)
+ component = session.query(Component).get(component_id)
+ architecture = session.query(Architecture).get(architecture_id)
+
+ output = open_packages(suite, component, architecture, type_name)
+
+ r = session.execute(_packages_query, {"suite": suite_id, "component": component_id,
+ "arch": architecture_id, "type_id": type_id, "type_name": type_name, "arch_all": arch_all_id})
+ for (stanza,) in r:
+ print >>output, stanza
+ print >>output, ""
+
+ session.close()
+
+ return ["generate-packages", suite.suite_name, component.component_name, architecture.arch_string]
+
+#############################################################################
+
+def main():
+ cnf = Config()
+
+ Arguments = [('h',"help","Generate-Packages-Sources::Options::Help"),
+ ('s',"suite","Generate-Packages-Sources::Options::Suite"),
+ ('f',"force","Generate-Packages-Sources::Options::Force")]
+
+ suite_names = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
+ try:
+ Options = cnf.SubTree("Generate-Packages-Sources::Options")
+ except KeyError:
+ Options = {}
+
+ if Options.has_key("Help"):
+ usage()
+
+ logger = daklog.Logger(cnf, 'generate-packages-sources2')
+
+ session = DBConn().session()
+
+ if Options.has_key("Suite"):
+ suites = []
+ for s in suite_names:
+ suite = get_suite(s.lower(), session)
+ if suite:
+ suites.append(suite)
+ else:
+ print "I: Cannot find suite %s" % s
+ logger.log(['Cannot find suite %s' % s])
+ else:
+ suites = session.query(Suite).filter(Suite.untouchable == False).all()
+
+ force = Options.has_key("Force") and Options["Force"]
+
+ component_ids = [ c.component_id for c in session.query(Component).all() ]
+
+ def log(details):
+ logger.log(details)
+
+ pool = Pool()
+ for s in suites:
+ if s.untouchable and not force:
+ utils.fubar("Refusing to touch %s (untouchable and not forced)" % s.suite_name)
+ for c in component_ids:
+ pool.apply_async(generate_sources, [s.suite_id, c], callback=log)
+ for a in s.architectures:
+ #pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'deb'], callback=log)
+ apply(generate_packages, [s.suite_id, c, a.arch_id, 'deb'])
+ #pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'udeb'], callback=log)
+
+ pool.close()
+ pool.join()
+ # this script doesn't change the database
+ session.close()
+
+if __name__ == '__main__':
+ main()
################################################################################
Cnf = None
-required_database_schema = 54
+required_database_schema = 55
################################################################################
'almost_obsolete_all_associations',
'almost_obsolete_src_associations',
'any_associations_source',
- 'bin_assoc_by_arch',
'bin_associations_binaries',
'binaries_suite_arch',
'binfiles_suite_component_arch',
done
exit $ERRVAL
}
-trap cleanup ERR EXIT TERM HUP INT QUIT
base="${base}/scripts/builddkeyrings"
INCOMING="${base}/incoming"
ERRORS="${base}/errors"
ADMINS="${base}/adminkeys.gpg"
+STAMPFILE="${base}/updatedkeyring"
# Default options for our gpg calls
DEFGPGOPT="--no-default-keyring --batch --no-tty --no-options --exit-on-status-write-error --no-greeting"
exit 1
fi
+cd "${INCOMING}"
+KEYS=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.key | sed -e "s,./,," | xargs)
+if [ -z "${KEYS}" ]; then
+ exit 0
+fi
+
+trap cleanup ERR EXIT TERM HUP INT QUIT
+
+# Tell prepare-dir that there is an update and it can run
+touch "${STAMPFILE}"
+
# Whenever something goes wrong, its put in there.
mkdir -p "${ERRORS}"
# We process all new files in our incoming directory
-for file in $(ls -1 ${INCOMING}/*.key); do
+for file in ${KEYS}; do
file=${file##*/}
# First we want to see if we recognize the filename. The buildd people have
# to follow a certain schema:
base="${base}/scripts/builddkeyrings"
TARGET="${base}/keyrings"
REMOVED="${base}/removed-buildd-keys.gpg"
+STAMPFILE="${base}/updatedkeyring"
-mkdir -p "${TARGET}/keyrings"
+mkdir -p "${TARGET}/buildd-keyrings"
-for arch in $archs; do
- if [ -f ${base}/${arch}/keyring.gpg ]; then
- cp -afl ${base}/${arch}/keyring.gpg ${TARGET}/buildd-keyrings/buildd-${arch}-keyring.gpg
- chmod 0644 ${TARGET}/buildd-keyrings/buildd-${arch}-keyring.gpg
- fi
-done
+if [ -f "${STAMPFILE}" ]; then
+ rm -f "${STAMPFILE}"
+ for arch in $archs; do
+ if [ -f ${base}/${arch}/keyring.gpg ]; then
+ cp -afl ${base}/${arch}/keyring.gpg ${TARGET}/buildd-keyrings/buildd-${arch}-keyring.gpg
+ chmod 0644 ${TARGET}/buildd-keyrings/buildd-${arch}-keyring.gpg
+ fi
+ done
-cd ${TARGET}
-sha512sum buildd-keyrings/* > sha512sums
+ cd ${TARGET}
+ sha512sum buildd-keyrings/* > sha512sums
-rm -f ${TARGET}/sha512sums.txt
-SIGNINGKEY=B1326A8D
-GNUPGHOME=${GNUPGHOME} gpg --no-options --batch --no-tty --armour --default-key ${SIGNINGKEY} --clearsign -o "${TARGET}/sha512sums.txt" "${TARGET}/sha512sums"
-rm -f ${TARGET}/sha512sums
+ rm -f ${TARGET}/sha512sums.txt
+ SIGNINGKEY=B1326A8D
+ GNUPGHOME=${GNUPGHOME} gpg --no-options --batch --no-tty --armour --default-key ${SIGNINGKEY} --clearsign -o "${TARGET}/sha512sums.txt" "${TARGET}/sha512sums"
+ rm -f ${TARGET}/sha512sums
+fi
done
exit $ERRVAL
}
-trap cleanup ERR EXIT TERM HUP INT QUIT
base="${base}/scripts/builddkeyrings"
INCOMING="${base}/incoming"
ERRORS="${base}/errors"
ADMINS="${base}/adminkeys.gpg"
REMOVED="${base}/removed-buildd-keys.gpg"
+STAMPFILE="${base}/updatedkeyring"
# Default options for our gpg calls
DEFGPGOPT="--no-default-keyring --batch --no-tty --no-options --exit-on-status-write-error --no-greeting"
exit 1
fi
+cd "${INCOMING}"
+KEYS=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.del | sed -e "s,./,," | xargs)
+if [ -z "${KEYS}" ]; then
+ exit 0
+fi
+
+trap cleanup ERR EXIT TERM HUP INT QUIT
+
+# Tell prepare-dir that there is an update and it can run
+touch "${STAMPFILE}"
+
# Whenever something goes wrong, its put in there.
mkdir -p "${ERRORS}"
# We process all new files in our incoming directory
-for file in $(ls -1 ${INCOMING}/*.del ); do
+for file in ${KEYS}; do
file=${file##*/}
# First we want to see if we recognize the filename. The buildd people have
# to follow a certain schema: