Joerg Jaspert [Tue, 7 Oct 2008 20:12:54 +0000 (22:12 +0200)]
Merge commit 'tomv_w/master' into merge
* commit 'tomv_w/master':
move config to config
message massage
move show-deferred to dak
move show-deferred to dak
implement public access to deferred
fix remaining days, some style
Add a Valid-Until "header" to the generated Release files.
Meaning "$receiver shouldn't trust this files after that date".
Should be used by apt and similar tools to detect some kind of MITM attacks,
see #499897 for more information.
Currently set to "7 days from now".
Only check md5sums after transfering stuff to the target if we are
configured to do this. We can't do this via ftp, as the files on
ftp.upload.debian.org aren't readable for us (vsftpd runs as a user
not allowed to read them).
Also, no need to check them - if the files are really broken then the
next queued will detect that and mail the maintainer anyways. So it
wont get broken files near the archive.
* commit 'tomv_w/master':
* Redo: Name it DEFERRED
split 'cancel' command off rm, use DELAYED/#-day/ prefixes, and rename 'mv' to 'reschedule'
* fix fatal typo
Thomas Viehmann [Tue, 16 Sep 2008 18:58:45 +0000 (18:58 +0000)]
* Redo: Name it DEFERRED
* Redo: Oi, Wow, that should have been committed centuries ago.
* Redo: Small changes
Remove lotsa old cvs history
Change maintainer name
Modify config to use the path we want
* Redo: Merge commit 'tomv_w/master' into merge
* commit 'tomv_w/master':
* no / in x-day
* fix bug in .commands rm-handling
* add delayed aging, extend is_on_target to consider all files
* debianqueued: finish new-style command handling
* debianqueued: allow removal from target delayed queue
* debianqueued/config: add delayed fields to sample config
Philipp Kern [Sat, 13 Sep 2008 14:21:13 +0000 (16:21 +0200)]
make .dak files world-readable
2008-09-13 Philipp Kern <pkern@debian.org>
* dak/queue.py (dump_vars): make .dak u,g=rw,o=r; James'
assumption (as stated in 2002-05-18's ChangeLog entry)
was that people will use the information therein albeit
it is "just" a duplication of information present in
other control files; people should still not use it
as source of information but access to those files makes
dak debugging easier and there is no leak of sensitive
information involved
Philipp Kern [Sun, 7 Sep 2008 21:46:51 +0000 (21:46 +0000)]
do not check for superfluous checksums-* entries for now
The current check for additional entries in checksums-* which are not
covered by entries in files is flawed because files could be modified
by autobyhand or sometimes when the file's already in the pool.
We need to rework this to look into the original files dict instead.
Philipp Kern [Sun, 7 Sep 2008 20:50:06 +0000 (22:50 +0200)]
dak/process_accepted.py (install): use dsc_file instead of file
* dak/process_accepted.py (install): better use dsc_file
instead of the (for the loop iteration) static file
variable
Signed-off-by: Philipp Kern <pkern@debian.org>
# Please enter the commit message for your changes.
# (Comment lines starting with '#' will not be included)
# On branch new-master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: ChangeLog
# modified: dak/process_accepted.py
#
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
#
# modified: daklib/database.py
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# config/asterix/
# diff
# ftp/
# incoming/
# lock/
# log/
# queue/
# web/removals.txt
* commit 'pkern/master':
Revert "revert all my stupid commits, we'll try this again later when we have a test server"
Revert "and revert the remainder"
implement sensible handling of checksum fields in .changes and .dsc
Philipp Kern [Sat, 6 Sep 2008 11:35:42 +0000 (11:35 +0000)]
dak/process_new.py (is_source_in_queue_dir): access u instead of Upload
2008-09-06 Philipp Kern <pkern@debian.org>
* dak/process_new.py (is_source_in_queue_dir): Access the right
variable to check if the given entry in the queue is the sourceful
upload we are looking for.
Philipp Kern [Sun, 31 Aug 2008 09:37:33 +0000 (09:37 +0000)]
cosmetic fixes for do_accept and do_accept_stableupdate
2008-08-31 Philipp Kern <pkern@debian.org>
* dak/process_new.py (_accept): new helper function to accept
an upload regularly, obeying no-action if set
* dak/process_new.py (do_accept): use _accept
* dak/process_new.py (do_accept_stableupdate): bail out in else
on binary uploads, in case we missed something; use the _accept
helper; reordered the queue checks to do frequent cases first
Joerg Jaspert [Fri, 29 Aug 2008 20:25:10 +0000 (22:25 +0200)]
Merge commit 'pkern/master'
* commit 'pkern/master':
fix proposed-updates processing in dinstall: actually accept sourceful uploads
dak/process_new.py: do not try to free the unchecked lockfile in no-action mode
Philipp Kern [Thu, 28 Aug 2008 20:47:22 +0000 (22:47 +0200)]
implement sensible handling of checksum fields in .changes and .dsc
2008-08-28 Philipp Kern <pkern@debian.org>
* daklib/utils.py (check_hashes): adapt to different API, check
sizes separately
* daklib/utils.py (parse_changes, parse_deb822): refactor
the string-based logic of parse_changes into a new function
parse_deb822; parse_changes itself remains file-based
* daklib/utils.py (hash_key): gives the key of a hash in the
files dict
* daklib/utils.py (create_hash, check_size): made more readable
* daklib/utils.py (check_hash): just check the hashes and complain
about missing checksums
* daklib/utils.py (check_hash_fields): function to reject unknown
checksums fields
* daklib/utils.py (_ensure_changes_hash, _ensure_dsc_hash): helper
functions for ensure_hashes; check their corresponding manifests'
hashes
* daklib/utils.py (ensure_hashes): retrieve the checksums fields
from the original filecontents blob so that they do not need to
be present in the .dak; refactored the actual checks by calling
the aforementioned helper functions
* daklib/utils.py (parse_checksums): parse a given checksums field
in a manifest and insert the values found into the files dict,
checking the file sizes on the way
Philipp Kern [Tue, 26 Aug 2008 10:25:39 +0000 (10:25 +0000)]
fix proposed-updates processing in dinstall: actually accept sourceful uploads
* dak/process_new.py (is_source_in_queue_dir): fix variable usage
* dak/process_new.py (move_to_holding): just state what we intend
to do in no-action mode
* dak/process_new.py (do_accept_stableupdate): fetch summaries,
fix invokation of is_source_in_queue_dir, actually accept sourceful
uploads in p-u holding
projects / dak / log