From: James Troup Date: Fri, 28 Dec 2007 22:09:30 +0000 (+0000) Subject: [JJ, r=JT] merge Joerg's outstanding changes. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e1aad646186f2df28c8dc8daeaabcdedbf161af;p=dak [JJ, r=JT] merge Joerg's outstanding changes. --- 4e1aad646186f2df28c8dc8daeaabcdedbf161af diff --cc ChangeLog index ff2ccb12,ae0abe8a..069f6743 --- a/ChangeLog +++ b/ChangeLog @@@ -1,23 -1,22 +1,42 @@@ +2007-12-28 Anthony Towns + + * daklib/utils.py (check_signature): add NOTATION_DATA and + NOTATION_NAME to known keywords. + + * daklib/queue.py (Upload.check_source_against_db): + + * dak/make_suite_file_list.py: add -f/--force option. + + * dak/generate_releases.py: add -a/--apt-conf=FILE and + -f/--force-touch options. Pull version info from the database. + Make suite description optional. + + * config/debian/dak.conf: update + Reject-Proposed-Updates::MoreInfoURL. Comment out + Suite::Stable::Version and ::Description. + + * config/debian/apt.conf: Add hurd-i386 to unstable + debian-installer stanza. + + 2007-12-28 Joerg Jaspert + + * KEYEXPIRED is actually a known keyword. We do check it earlier + on and reject in case the sig is bad (or unknown) + + 2007-12-24 Joerg Jaspert + + * Also run lintian on the .dsc file to check the source itself. + + * Fix the direct usage of ar | tar etc to get the copyright file + and use dpkg-deb, which is made for this and makes us able to + process data.tar.bz2 (or whatever format it will be in the + future). + + 2007-12-21 Joerg Jaspert + + * Remove the (now useless) check for a pre-depends on dpkg for + binaries that contain bzip2 compressed data tarballs. + 2007-08-28 Anthony Towns * process_unchecked.py: Add support for automatic BYHAND diff --cc daklib/utils.py index a3c46a7b,a7a10857..2b40219c mode 100644,100755..100755 --- a/daklib/utils.py +++ b/daklib/utils.py @@@ -1060,7 -1060,7 +1060,7 @@@ used."" # Finally ensure there's not something we don't recognise known_keywords = Dict(VALIDSIG="",SIG_ID="",GOODSIG="",BADSIG="",ERRSIG="", SIGEXPIRED="",KEYREVOKED="",NO_PUBKEY="",BADARMOR="", - NODATA="",NOTATION_DATA="",NOTATION_NAME="") - NODATA="",KEYEXPIRED="") ++ NODATA="",NOTATION_DATA="",NOTATION_NAME="",KEYEXPIRED="") for keyword in keywords.keys(): if not known_keywords.has_key(keyword):