use correct function name

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

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  initialise template variables

Signed-off-by: Joerg Jaspert <joerg@debian.org>

initialise template variables

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

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Don't repr the object; could be a long (and ends up with eg. "2L")

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  the database is faster than us now

Signed-off-by: Joerg Jaspert <joerg@debian.org>

the database is faster than us now

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

Don't repr the object; could be a long (and ends up with eg. "2L")

Signed-off-by: Chris Lamb <lamby@debian.org>

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  make cruft_report report
  whoops - call it with the object, not the name
  call get_suite_binaries properly
  pass parameters properly

Signed-off-by: Joerg Jaspert <joerg@debian.org>

make cruft_report report

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

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Use the correct dictionary to lookup name of users.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Use the correct dictionary to lookup name of users.

Signed-off-by: Chris Lamb <lamby@debian.org>

whoops - call it with the object, not the name

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

call get_suite_binaries properly

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

pass parameters properly

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

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  import a class we need and don't hide errors

Signed-off-by: Joerg Jaspert <joerg@debian.org>

import a class we need and don't hide errors

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

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  hack around file hanging around forever

Signed-off-by: Joerg Jaspert <joerg@debian.org>

hack around file hanging around forever

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

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Revert "Use gzip.open(.., 'rb')" as this version of python-apt is olde
  Find/replace fail.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Revert "Use gzip.open(.., 'rb')" as this version of python-apt is olde

This reverts commit 91cd6acebec69854074c594bf917561001f57ef4.

Signed-off-by: Chris Lamb <lamby@debian.org>

Find/replace fail.

Signed-off-by: Chris Lamb <lamby@debian.org>

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  fix handling of suite names

Signed-off-by: Joerg Jaspert <joerg@debian.org>

fix handling of suite names

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

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Make import_keyring use dbconn.get_or_set_uid.
  Make import_keyring use get_or_set_keyring.
  Port database.get_or_set_keyring_id => dbconn.get_or_set_keyring
  Use gzip.open(.., 'rb') instead of gunzip and temporary filenames.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Make import_keyring use dbconn.get_or_set_uid.

Signed-off-by: Chris Lamb <lamby@debian.org>

Make import_keyring use get_or_set_keyring.

Signed-off-by: Chris Lamb <lamby@debian.org>

Port database.get_or_set_keyring_id => dbconn.get_or_set_keyring

Signed-off-by: Chris Lamb <lamby@debian.org>

Use gzip.open(.., 'rb') instead of gunzip and temporary filenames.

Signed-off-by: Chris Lamb <lamby@debian.org>

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  use the right variable names

Signed-off-by: Joerg Jaspert <joerg@debian.org>

use the right variable names

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

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  import a function which we use

Signed-off-by: Joerg Jaspert <joerg@debian.org>

import a function which we use

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

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  and again...

Signed-off-by: Joerg Jaspert <joerg@debian.org>

and again...

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

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  use the right variable name

Signed-off-by: Joerg Jaspert <joerg@debian.org>

use the right variable name

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

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  pass session down to delete_packages

Signed-off-by: Joerg Jaspert <joerg@debian.org>

pass session down to delete_packages

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

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  get_suite_architectures returns [Architecture] now, not [str]

Signed-off-by: Joerg Jaspert <joerg@debian.org>

get_suite_architectures returns [Architecture] now, not [str]

Signed-off-by: Chris Lamb <lamby@debian.org>

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Alter get_maintainer API to return Maintainer object or None
  Fix get_maintainer

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Alter get_maintainer API to return Maintainer object or None

Signed-off-by: Chris Lamb <lamby@debian.org>

Fix get_maintainer

Signed-off-by: Chris Lamb <lamby@debian.org>

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Port get_maintainer to dbconn.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Port get_maintainer to dbconn.

Signed-off-by: Chris Lamb <lamby@debian.org>

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  another merge failure

Signed-off-by: Joerg Jaspert <joerg@debian.org>

another merge failure

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

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  fix bad merge

Signed-off-by: Joerg Jaspert <joerg@debian.org>

fix bad merge

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

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  remove UserExtensions
  move extensions back into main code base

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Use session because we have it.
  daklib.database has gone away; use dbconn versions.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

remove UserExtensions

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

move extensions back into main code base

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

Use session because we have it.

Signed-off-by: Chris Lamb <lamby@debian.org>

daklib.database has gone away; use dbconn versions.

Signed-off-by: Chris Lamb <lamby@debian.org>

Merge commit 'mhy/sqlalchemy' into merge

* commit 'mhy/sqlalchemy': (135 commits)
  pass session to get_id
  NULL is None, not ""
  fix bad merge in 1c35448b880358d020e81339657e3435fdda9434
  typo fixes
  clean up holding path
  only look in queues which exist
  handle bad checksum lines
  misc fixes
  fix typo
  fix typo
  attempt to ensure we clear up sessions
  make sure we close sessions
  miscellaneous fixups from testing
  convert check_overrides to new DB API
  convert override.py to new DB API
  convert (badly) rm to new DB API
  convert ls to new DB API
  bug fix
  convert import_keyring to new DB API
  convert cruft_report to new DB API
  ...

Signed-off-by: Joerg Jaspert <joerg@debian.org>

and another

another useless script gone.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

pass session to get_id

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

NULL is None, not ""

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

cleanup

remove 2 unused commands.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

fix bad merge in 1c35448b880358d020e81339657e3435fdda9434

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

Merge commit 'origin/sqlalchemy' into sqlalchemy

Merge commit 'ftpmaster/master' into sqlalchemy

Conflicts:
dak/override.py
dak/process_unchecked.py

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

add a guest user

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

shut up import-users-from-passwd on merkel

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

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Reject "dcut rm" components that start with a wildcard

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Reject "dcut rm" components that start with a wildcard

typo fixes

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

Merge branch 'sqlalchemy' of http://ftp-master.debian.org/~mhy/git/dak into sqlalchemy

clean up holding path

Signed-off-by: Mark Hymers <mark.hymers@ynic.york.ac.uk>

only look in queues which exist

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

handle bad checksum lines

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

misc fixes

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

fix typo

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

fix typo

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

attempt to ensure we clear up sessions

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

make sure we close sessions

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

miscellaneous fixups from testing

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

The other way round

Signed-off-by: Joerg Jaspert <joerg@debian.org>

rm template

change templates wording about testing removals

Signed-off-by: Joerg Jaspert <joerg@debian.org>

p-u

urgency may be followed by a comment (seperated by space), see policy 5.6.17

Signed-off-by: Joerg Jaspert <joerg@debian.org>

process-new

log the exact override changes done in NEW

Signed-off-by: Joerg Jaspert <joerg@debian.org>

make_suite_file_list

option typo

Signed-off-by: Joerg Jaspert <joerg@debian.org>

fixup epydoc

Signed-off-by: Joerg Jaspert <joerg@debian.org>

reject.html

remove non-US foo

Signed-off-by: Joerg Jaspert <joerg@debian.org>

queued

use a C locale.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

debianqueued

tell on which hostname it runs on

Signed-off-by: Joerg Jaspert <joerg@debian.org>

generate_releases

now also include the Contents-$arch.diff/Index files into the release
file, so tools who use them to mirror Debian (brrrr)  can also mirror those.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Generate an index for i18n files and list that index in Release

Signed-off-by: Joerg Jaspert <joerg@debian.org>

hello mhy

turn off sending the mail log when we successfully end.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

dinstall

what was i smoking? We want the default to be different to false.
tsak.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Fix import-keyring call

Signed-off-by: Joerg Jaspert <joerg@debian.org>

queued config

use the dm keyring

Signed-off-by: Joerg Jaspert <joerg@debian.org>

byhand-dm

get rid of one autobyhand, yay

Signed-off-by: Joerg Jaspert <joerg@debian.org>

cron.dinstall

also import changes to the debian-maintainers keyring in
fingerprints(), as it is now properly maintained.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

dak.conf

drop the d-m autobyhand foo

Signed-off-by: Joerg Jaspert <joerg@debian.org>

dak.conf

Use the new path for the dm keyring

Signed-off-by: Joerg Jaspert <joerg@debian.org>

override

send a copy of the bug closing message to the package maintainer

Signed-off-by: Joerg Jaspert <joerg@debian.org>

website

add the dc9 talk

Signed-off-by: Joerg Jaspert <joerg@debian.org>

add information about roles from https://penta.debconf.org/dc9_schedule/attachments/127_ftpmaster.pdf to the website.