Conflicts:

	ChangeLog

* commit 'pkern/p-u-new':
  dak/process_new.py (is_source_in_queue_dir): access u instead of Upload
Signed-off-by: NJoerg Jaspert <joerg@debian.org>

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.

Added last pseudopackages ever. (Well, before the two files finally go
and are maintained by the BTS people).
Signed-off-by: NJoerg Jaspert <joerg@debian.org>

Conflicts:

	ChangeLog
	daklib/utils.py

This reverts commit aa83ebb1.

Conflicts:

	ChangeLog

This reverts commit 536cb00b.

Fix Philipps new helper function to not break by moving Upload.build_summaries there.

* commit 'pkern/master':
  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
Signed-off-by: NPhilipp Kern <pkern@debian.org>

* commit 'pkern/master':
  dak/process_new.py (is_source_in_queue_dir): add the queue path to the changes filename

* dak/process_new.py (is_source_in_queue_dir): join the queue path
  because os.listdir entries come with their path stripped
Signed-off-by: NPhilipp Kern <pkern@debian.org>

* commit 'pkern/master':
  process_new/do_accept_stableupdate: state what we intend to do

2008-08-30  Philipp Kern  <pkern@debian.org>

        * dak/process_new.py (do_accept_stableupdate): state what we intend
        to do
Signed-off-by: NPhilipp Kern <pkern@debian.org>

* 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

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

* 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

* commit 'mhy/checksums':
  and revert the remainder
  revert all my stupid commits, we'll try this again later when we have a test server
  Revert "use correct field names"
  use correct field names

Signed-off-by: NMark Hymers <mhy@debian.org>

Signed-off-by: NMark Hymers <mhy@debian.org>

This reverts commit f50c6be1.

Signed-off-by: NMark Hymers <mhy@debian.org>

* commit 'mhy/checksums':
  fix set_files_id routine

Signed-off-by: NMark Hymers <mhy@debian.org>

* commit 'mhy/checksums':
  another attempt to add these damned hashes

Signed-off-by: NMark Hymers <mhy@debian.org>

* commit 'mhy/checksums':
  I hate it when Ganneff is right
  don't assume we can check for the checksums fields

Signed-off-by: NMark Hymers <mhy@debian.org>

Signed-off-by: NMark Hymers <mhy@debian.org>

Merge commit 'mhy/checksums'

* commit 'mhy/checksums':
  misc fixes

Signed-off-by: NMark Hymers <mhy@debian.org>

* commit 'mhy/checksums':
  Actually import a module before using it.

Signed-off-by: NMark Hymers <mhy@debian.org>

* commit 'mhy/checksums':
  actually check the type of basedict before trying to use it

Signed-off-by: NMark Hymers <mhy@debian.org>

* commit 'mhy/checksums':
  revert change to get_files_id

Signed-off-by: NMark Hymers <mhy@debian.org>

* commit 'mhy/checksums':
  expand check_archive.py to cope with extra checksums
  add changelog to keep Ganneff happy
  add sha1sum and sha256sum columns
  fix typos
  make process accepted not die with old .dak files
  an attempt to move the functionaliity into a module
  let's store the known_hashes information centrally
  first attempt at bodging in support for sha1sum and sha256sum