Merge commit 'ftpmaster/master'

don't let Ganneff send messages in german

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

Merge commit 'mhy/master' into merge

* commit 'mhy/master': (50 commits)
  hmm...
  fix name
  right variable name
  I'm never tidying up names again
  poolfile, you moron
  in_queue is the object, _id the id
  queue_id -> policy_queue_id
  fix variable name
  argh
  When changing Queue -> Build/PolicyQueue, it helps to do a full job
  argh, another typo
  typo
  well spotted, djpig
  Fix up hand off to policy and buildd queues
  sort out permission columns
  do not support multi-archive mode in process-upload
  check_files: Fix check for known changes files
  Small fixes
  Fix typo in foreign key constraint name
  initial policy queue implementation in process_upload
  ...

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

hmm...

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

fix name

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

right variable name

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

I'm never tidying up names again

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

poolfile, you moron

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

in_queue is the object, _id the id

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

queue_id -> policy_queue_id

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

fix variable name

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

argh

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

When changing Queue -> Build/PolicyQueue, it helps to do a full job

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

argh, another typo

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

typo

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

well spotted, djpig

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

Fix up hand off to policy and buildd queues

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

Merge commit 'ftpmaster/master'

Merge commit 'djpig/process-upload'

sort out permission columns

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

do not support multi-archive mode in process-upload

We don't actually have any multi-archive machines at the moment
and removing it makes test-setups easier to do.

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

check_files: Fix check for known changes files

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

Small fixes

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

Fix typo in foreign key constraint name

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

Merge commit 'mhy/master' into process-upload

initial policy queue implementation in process_upload

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

Move one tag

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

fix up existing changes file handling

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

Multi-valued changes fields are space-separated

Not comma-separated.

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

rename known_changes

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

Merge commit 'ftpmaster/master'

Conflicts:
daklib/dbconn.py

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

Try to sanitise changes and queue handling

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

Stop talking about old and even older and yet older versions / vcs information

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

remove some very old files

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

Merge commit 'djpig/djpig' into merge

* commit 'djpig/djpig':
  clean_queues: Log which queue we remove from

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

clean_queues: Log which queue we remove from

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

Merge commit 'djpig/djpig' into merge

* commit 'djpig/djpig':
  Fix error in SQLA mapper setup

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

Fix error in SQLA mapper setup

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

Fix queue-report

Since we have no .dak files anymore, parse the changes file directly.

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

remove manpages, not much sense to have them, noone uses them

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

remove a manpage. closes: 540170

remove a manpage

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

rm

another rm.
closes: #540170

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

readme

remove a pretty old documentation

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

update-db: General code cleanup

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

Merge commit 'djpig/process-upload'

Also remove p-a and p-unchecked to avoid confusion

Conflicts:
daklib/dbconn.py
daklib/queue.py

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

check_files: check changes against known_changes

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

Various fixes

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

changes: fix known_changes handling of parsed changes files

Some fields in the changes file are stored as dicts, so handle
them correctly here where we only want the string.

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

changes: Remove .dak file handling

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

don't delete files in queue_files

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

check_dsc_against_db: fix a corner-case in .orig. handling

If the .orig.tar was contained in the .changes file but already
present in the pool, we did delete it from the file list, but
did not record the files id in the desc file list.

In the old code this did not cause any errors since process-accepted
called check_dsc_against_db with the file list loaded from the .dak
file which was already cleansed of the .orig. So it took the other
code branch (.orig. present in the pool but not in changes) which
did record the files id.

Now we only call check_dsc_against_db once in process-upload so
we need to record the files id in this case, too.

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

process-upload: try to use the same session all over the code

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

Fix various errors caused by moving stuff around

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

process-upload: make sure we clean up after ourself

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

changes: Use @session_wrapper

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

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  add changes and queue handling

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

add changes and queue handling

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

sig verify

dont barf on policy_url in a sig, even if the usge of that is pretty
pointless for things uploaded to the archive.

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

queue: Add missing SQLA import

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

Fix typo in function name

check_dm_source_upload -> check_dm_upload

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

Merge process-accepted's install into Upload.install()

queue build support is still disabled since we will modify that
significantly.

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

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>