Merge commit 'stew/knownchanges' into merge

* commit 'stew/knownchanges':
  try to get rid of deadlock

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

try to get rid of deadlock

Signed-off-by: Mike O'Connor <stew@vireo.org>

Merge commit 'stew/knownchanges' into merge

* commit 'stew/knownchanges':
  towpdown import_known_changes

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

towpdown import_known_changes

Signed-off-by: Mike O'Connor <stew@vireo.org>

Merge commit 'mhy/suitesql' into merge

* commit 'mhy/suitesql':
  never change things at the last minute...

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

never change things at the last minute...

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

Merge commit 'mhy/suitesql' into merge

* commit 'mhy/suitesql':
  fix up policy_queue support in the ORM and drop old column
  add support for policy queues to the database

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

Merge commit 'ftpmaster/master' into suitesql

fix up policy_queue support in the ORM and drop old column

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

Merge commit 'stew/knownchanges' into merge

* commit 'stew/knownchanges':
  I                                         LOVE                                           WHITESPACE
  i was trying to interrupt this with the keyboards and failing
  get rid of log msgs
  import known_changes with correct name.  catch keybord exception

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

I                                         LOVE                                           WHITESPACE

add support for policy queues to the database

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

i was trying to interrupt this with the keyboards and failing

Add an inline signed release file

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

epydoc header

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

Merge commit 'public/knownchanges' into knownchanges

get rid of log msgs

import known_changes with correct name.  catch keybord exception

Signed-off-by: Mike O'Connor <stew@vireo.org>

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Remove duplicate return statement.
  Add missing Config initialiser.
  Fix do_anaias in cruft-report.
  Add missing import in contents
  Add missing configuration initialiser.
  Fix check_indices_files_exist in check-archive.
  Fix local variable in check-archive/check_override
  Fix check_override in check-archive.
  Don't shadow built-in 'file'
  Consistently use 4-spaces in add_user.py
  Don't mix tabs and spaces in add_user.py

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

Remove duplicate return statement.

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

Add missing Config initialiser.

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

Fix do_anaias in cruft-report.

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

Add missing import in contents

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

Add missing configuration initialiser.

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

Fix check_indices_files_exist in check-archive.

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

Fix local variable in check-archive/check_override

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

Fix check_override in check-archive.

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

Don't shadow built-in 'file'

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

Consistently use 4-spaces in add_user.py

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

Merge commit 'stew/knownchanges' into merge

* commit 'stew/knownchanges':
  now actuall working

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

merge from flotow

Signed-off-by: Mike O'Connor <stew@vireo.org>

Merge commit 'stew/knownchanges' into merge

* commit 'stew/knownchanges':
  importing old changes files into knwon_changes with a separeate script, now allowing some fields to be 'missing'

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

Don't mix tabs and spaces in add_user.py

Merge remote branch 'origin/master' into knownchanges

now actuall working

Merge branch 'merge'

* merge:
  Revert "remove an unneeded linewrap" - not needed anymore.
  Strip trailing newline, just like getstatusoutput

Merge commit 'origin/master'

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Revert "remove an unneeded linewrap" - not needed anymore.
  Strip trailing newline, just like getstatusoutput

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

convert to using the debversion C type

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

Revert "remove an unneeded linewrap" - not needed anymore.

This reverts commit fa8582a41855d39d864495f1bc0b28805d992ad1.

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

Strip trailing newline, just like getstatusoutput

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

add missing s

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

remove an unneeded linewrap

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

Misses summary

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

Add suites to bug close mails from rm

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

importing old changes files into knwon_changes with a separeate script, now allowing some fields to be 'missing'

dak rm

also print the bug closing reason within the bug close mail

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

you are named p-u, not dinstall

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

template

modify our contents template

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

Oh well

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

And now this is clearly pythons fault. Ruby would have broken earlier! :)

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

And how about we make this mhy fault?

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

And that is probaby Linux (hello git) fault :)

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

And that is probably (not) ganneffs fault

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

Its (not) probably all stews fault

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

knwonchnges

do not import subdirs for now.

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

Merge commit 'stew/knownchanges' into merge

* commit 'stew/knownchanges':
  trailing whitespace, update to 18 not 20
  update20 -> update 18
  removing known_changes now works, and inserting has a better chance of working
  update20 is closer to tested
  check for a DAK_CONFIG env variable when looking for dak.conf
  moved inserts of known_changes to Changes() class. add insert known_changes in p-u, remove known_changes in process_new.reject
  Start the known_changes table

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

trailing whitespace, update to 18 not 20

Signed-off-by: Mike O'Connor <stew@vireo.org>

merge with ftp-master

Signed-off-by: Mike O'Connor <stew@vireo.org>

update20 -> update 18

Signed-off-by: Mike O'Connor <stew@vireo.org>

Merge commit 'stew/contents' into merge

* commit 'stew/contents':
  bootstrap_bin working
  merge from master with sqla

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

merge from master

Signed-off-by: Mike O'Connor <stew@vireo.org>

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  update import_keyring
  now we don't need the dm flag
  allow for keyring priorities
  implement key acls
  add keyring defaults
  tidy up and add more methods to SQLA objects
  add basic mapper classes for new tables
  add acls to database schema
  fix indentation
  move check_status to daklib/queue.py
  move recheck logic into daklib/queue.py
  remove unused code (moving to process-holding) and readd security support

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

removing known_changes now works, and inserting has a better chance of working

Signed-off-by: Mike O'Connor <stew@dhcp-101.dfw1.kickstart.lan>

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Correct local variable name in Upload.package_info.

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

Correct local variable name in Upload.package_info.

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

update20 is closer to tested

Signed-off-by: Mike O'Connor <stew@dhcp-101.dfw1.kickstart.lan>

check for a DAK_CONFIG env variable when looking for dak.conf

Signed-off-by: Mike O'Connor <stew@dhcp-101.dfw1.kickstart.lan>

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Refactor Upload.package_info.
  Prefer interpolation over concatenation here.
  Add more spacing for reject messages/notes etc.

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

Refactor Upload.package_info.

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

moved inserts of known_changes to Changes() class. add insert known_changes in p-u, remove known_changes in process_new.reject

Signed-off-by: Mike O'Connor <stew@vireo.org>

Prefer interpolation over concatenation here.

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

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Log whether maintainer can override when we lintian auto-reject.
  This is not icanhascheezburger.com :(

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

Add more spacing for reject messages/notes etc.

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

Log whether maintainer can override when we lintian auto-reject.

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

This is not icanhascheezburger.com :(

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

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Don't reject binary uploads. Sorry buildd maintainers.

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

Don't reject binary uploads. Sorry buildd maintainers.

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

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Add NVIT test.

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

Add NVIT test.

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

Merge commit 'ftpmaster/master'

update import_keyring

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

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Fix another list.join/str.join instance.

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

Fix another list.join/str.join instance.

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

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Prefer interpolation over concatenation.
  Join is str.join, not list.join

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

Prefer interpolation over concatenation.

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

Join is str.join, not list.join

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

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  cnf.__getitem__ is not following protocol, but this is an easier fix.

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

cnf.__getitem__ is not following protocol, but this is an easier fix.

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

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  We renamed s/directory/queue/ in this code.

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

We renamed s/directory/queue/ in this code.

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

add some tags

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

Start the known_changes table

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

Merge branch 'merge'

* merge:
  Some people can't open the log; handle this gracefully.
  Split out symlink creation into Upload.ensure_orig

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Some people can't open the log; handle this gracefully.
  Split out symlink creation into Upload.ensure_orig

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

Some people can't open the log; handle this gracefully.

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

now we don't need the dm flag

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

allow for keyring priorities

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

Merge commit 'ftpmaster/master'

implement key acls

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