Upload: remove cruft

* Remove unused reprocess member
* Remove CopyDotDak support

Signed-off-by: Frank Lichtenheld <djpig@debian.org>

Move helper functions for database insertion to dbconn

Copy
add_poolfile
add_dsc_to_db
add_deb_to_db
from process-accepted to dbconn so that we can use them
from the new process-upload.

Signed-off-by: Frank Lichtenheld <djpig@debian.org>

Merge commit 'private/master' into process-upload

Merge commit 'stew/knownchanges' into merge

* commit 'stew/knownchanges':
  split read and write locks

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

split read and write locks

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

Merge commit 'lamby/master' into merge

* commit 'lamby/master': (23 commits)
  'as' is a reserved word in Python 2.6.
  Don't shadow 'file' builtin in daklib.queue.
  Use 4 spaces for indentation.
  Correct code to match documentation of Binary.check_utf8_package
  Remove unused 'time' import.
  Correct isinstance call; DictType is not an actual type.
  dak's "Dict" is a synonym of the 'dict' builtin
  Use foo.iteritems() to avoid reentrancy with foo[k].
  Don't shadow 'map' builtin in daklib.utils.TemplateSubst
  Update comment about our monkeypatching of commands.getstatusoutput.
  Remove duplicated 'commands' import.
  Don't use deprecated string module.
  Remove unused imports from daklib.queue.
  Remove shadowing builtins in daklib.queue
  Remove daklib's now-unused extension functionality.
  Remove shadowing builtins in daklib.dbconn.
  Don't shadow 'dir' builtin in daklib.utils.get_changes_files
  We don't use re_is_orig_source in daklib.utils anymore.
  Don't shadow "dir" builtin.
  Fix uid references in DM upload error codepaths.
  ...

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

'as' is a reserved word in Python 2.6.

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

Don't shadow 'file' builtin in daklib.queue.

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

Use 4 spaces for indentation.

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

Correct code to match documentation of Binary.check_utf8_package

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

Remove unused 'time' import.

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

Correct isinstance call; DictType is not an actual type.

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

dak's "Dict" is a synonym of the 'dict' builtin

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

Use foo.iteritems() to avoid reentrancy with foo[k].

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

Don't shadow 'map' builtin in daklib.utils.TemplateSubst

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

Update comment about our monkeypatching of commands.getstatusoutput.

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

Remove duplicated 'commands' import.

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

Don't use deprecated string module.

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

Remove unused imports from daklib.queue.

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

Remove shadowing builtins in daklib.queue

Remove daklib's now-unused extension functionality.

Was only used for ACL-like purposes which was re-implemented.

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

Remove shadowing builtins in daklib.dbconn.

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

Don't shadow 'dir' builtin in daklib.utils.get_changes_files

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

We don't use re_is_orig_source in daklib.utils anymore.

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

Don't shadow "dir" builtin.

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

Fix uid references in DM upload error codepaths.

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

Fix component references in upload component error codepaths.

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

Fix handling of invalid Maintainer field.

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

Merge commit 'stew/knownchanges' into merge

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

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

process-upload: import action() from process-unchecked

Signed-off-by: Frank Lichtenheld <djpig@debian.org>

try to get rid of deadlock

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

sort out type problem

Signed-off-by: Mark Hymers <mhy@debian.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>

queue_install: Adapt to new code organisation

Signed-off-by: Frank Lichtenheld <djpig@debian.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>

Copy parts of process-unchecked to daklib.queue_install

To not bloat the new process-upload script unnecessarily

Signed-off-by: Frank Lichtenheld <djpig@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>

process-upload: clean up process_it()

Signed-off-by: Frank Lichtenheld <djpig@debian.org>

epydoc header

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

process-upload: import process_it() from process-unchecked

Signed-off-by: Frank Lichtenheld <djpig@debian.org>

process-upload: reorganise option parsing

Give more helpful error messages and log where we did get
the changes files from.

Signed-off-by: Frank Lichtenheld <djpig@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>

process-upload: Change logging behaviour for --no-action

Log to stderr instead if not at all.

Signed-off-by: Frank Lichtenheld <djpig@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 commit 'private/master' into process-upload

Merge remote branch 'origin/master' into knownchanges

now actuall working

process-upload: Add standard boilerplate code

Signed-off-by: Frank Lichtenheld <djpig@debian.org>

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>

Document the current workings of p-u and p-a

So that we can find a way to merge them in one script.

Signed-off-by: Frank Lichtenheld <djpig@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>