From: Philipp Kern <pkern@debian.org>
Date: Tue, 2 Sep 2008 19:01:44 +0000 (+0200)
Subject: Merge branch 'checksums'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=95f05e8aac2673dadfef6aed999551d60cb6d322;p=dak.git

Merge branch 'checksums'

Conflicts:

	ChangeLog
	daklib/utils.py
---

95f05e8aac2673dadfef6aed999551d60cb6d322
diff --cc ChangeLog
index a7f4a3af,87a42732..cc6c1c8e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,41 -1,36 +1,74 @@@
+ 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
+ 
 +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
 +
 +2008-08-30  Philipp Kern  <pkern@debian.org>
 +
 +	* dak/process_new.py (is_source_in_queue_dir): join the queue path
 +	because os.listdir entries come with their path stripped
 +
 +2008-08-30  Philipp Kern  <pkern@debian.org>
 +
 +	* dak/process_new.py (do_accept_stableupdate): state what we intend
 +	to do
 +
 +2008-08-26  Philipp Kern  <pkern@debian.org>
 +
 +	* 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
 +
 +2008-08-26  Philipp Kern  <pkern@debian.org>
 +
 +	* dak/process_new.py (do_accept): do not try to free the unchecked
 +	lockfile in no-action mode
 +
 +2008-08-16  Joerg Jaspert  <joerg@debian.org>
 +
 +	* config/debian/cron.dinstall: We dont want i18n to ever fail
 +	dinstall, add a || true
 +
  2008-08-15  Mark Hymers  <mhy@debian.org>
  
  	* daklib/utils.py: Actually import a module before using it.