This reverts commit aa83ebb1.

Conflicts:

	ChangeLog

This reverts commit 536cb00b.

* 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

* 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

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

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

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

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

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

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

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