]> git.decadent.org.uk Git - dak.git/log
dak.git
15 years agofix up tbl handling
Mark Hymers [Sun, 1 Nov 2009 09:27:37 +0000 (09:27 +0000)]
fix up tbl handling

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agolenny's python-apt does not support "#" comments.
Chris Lamb [Sun, 1 Nov 2009 09:27:11 +0000 (09:27 +0000)]
lenny's python-apt does not support "#" comments.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoRevert "no i-u-f-p"
Joerg Jaspert [Sun, 1 Nov 2009 09:23:48 +0000 (10:23 +0100)]
Revert "no i-u-f-p"

This reverts commit 983f7ea9cec7265c4d5c59af2c355881bdec0f20.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoMerge commit 'ftpmaster/master'
Mark Hymers [Sun, 1 Nov 2009 09:22:53 +0000 (09:22 +0000)]
Merge commit 'ftpmaster/master'

15 years agono i-u-f-p
Joerg Jaspert [Sun, 1 Nov 2009 09:22:13 +0000 (10:22 +0100)]
no i-u-f-p

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agocron
Joerg Jaspert [Sun, 1 Nov 2009 09:20:49 +0000 (10:20 +0100)]
cron

modify for new world order

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoMerge commit 'lamby/master' into merge
Joerg Jaspert [Sun, 1 Nov 2009 09:06:47 +0000 (10:06 +0100)]
Merge commit 'lamby/master' into merge

* commit 'lamby/master': (23 commits)
  Add tests for process_gpgv_output
  Remove some of the Table boilerplate
  Heh, someone fixed these issues since 2001.
  Add dak.conf for tests as utilities parse it.
  Port old tests to unittest; currently 18 failures.
  Add a 'fixture' utility to generate a path to a fixture.
  Tidy daklib.utils.which_conf_file
  Use a custom dak.conf during tests - now we can import daklib.utils.
  Drop executable bits on libraries.
  Prefer the "Borg" pattern over the GoF singleton pattern.
  Remove empty docstring.
  Make daklib.lintian work on the named groups, not the "flat" groups
  Use named groups in lintian regex.
  Alter generate_reject_messages to return a generator.
  Tidy upload.check_lintian.
  Generate lintian reject messages in daklib.lintian + tests
  Add a docstring for parse_lintian_output
  An empty output is handled fine.
  Move lintian parsing to daklib.lintian and add tests.
  Rename warning/error in lintian autorejects to nonfatal/fatal.
  ...

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoAdd tests for process_gpgv_output
Chris Lamb [Sat, 31 Oct 2009 23:28:41 +0000 (23:28 +0000)]
Add tests for process_gpgv_output

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoMerge commit 'ftpmaster/master'
Mark Hymers [Sat, 31 Oct 2009 23:24:56 +0000 (23:24 +0000)]
Merge commit 'ftpmaster/master'

15 years agodon't let Ganneff send messages in german
Mark Hymers [Sat, 31 Oct 2009 23:24:35 +0000 (23:24 +0000)]
don't let Ganneff send messages in german

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoRemove some of the Table boilerplate
Chris Lamb [Sat, 31 Oct 2009 23:06:29 +0000 (23:06 +0000)]
Remove some of the Table boilerplate

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoHeh, someone fixed these issues since 2001.
Chris Lamb [Sat, 31 Oct 2009 21:49:33 +0000 (21:49 +0000)]
Heh, someone fixed these issues since 2001.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoAdd dak.conf for tests as utilities parse it.
Chris Lamb [Sat, 31 Oct 2009 21:35:45 +0000 (21:35 +0000)]
Add dak.conf for tests as utilities parse it.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoPort old tests to unittest; currently 18 failures.
Chris Lamb [Sat, 31 Oct 2009 21:35:19 +0000 (21:35 +0000)]
Port old tests to unittest; currently 18 failures.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoAdd a 'fixture' utility to generate a path to a fixture.
Chris Lamb [Sat, 31 Oct 2009 15:39:46 +0000 (15:39 +0000)]
Add a 'fixture' utility to generate a path to a fixture.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoTidy daklib.utils.which_conf_file
Chris Lamb [Sat, 31 Oct 2009 13:53:30 +0000 (13:53 +0000)]
Tidy daklib.utils.which_conf_file

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoUse a custom dak.conf during tests - now we can import daklib.utils.
Chris Lamb [Sat, 31 Oct 2009 13:53:11 +0000 (13:53 +0000)]
Use a custom dak.conf during tests - now we can import daklib.utils.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoDrop executable bits on libraries.
Chris Lamb [Sat, 31 Oct 2009 12:36:44 +0000 (12:36 +0000)]
Drop executable bits on libraries.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoPrefer the "Borg" pattern over the GoF singleton pattern.
Chris Lamb [Sat, 31 Oct 2009 12:23:21 +0000 (12:23 +0000)]
Prefer the "Borg" pattern over the GoF singleton pattern.

The only visible difference is the lack of object identity between
instances.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoRemove empty docstring.
Chris Lamb [Sat, 31 Oct 2009 11:06:20 +0000 (11:06 +0000)]
Remove empty docstring.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoMake daklib.lintian work on the named groups, not the "flat" groups
Chris Lamb [Sat, 31 Oct 2009 10:54:29 +0000 (10:54 +0000)]
Make daklib.lintian work on the named groups, not the "flat" groups

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoUse named groups in lintian regex.
Chris Lamb [Sat, 31 Oct 2009 10:41:42 +0000 (10:41 +0000)]
Use named groups in lintian regex.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoAlter generate_reject_messages to return a generator.
Chris Lamb [Sat, 31 Oct 2009 10:29:14 +0000 (10:29 +0000)]
Alter generate_reject_messages to return a generator.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoTidy upload.check_lintian.
Chris Lamb [Sat, 31 Oct 2009 10:25:01 +0000 (10:25 +0000)]
Tidy upload.check_lintian.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoGenerate lintian reject messages in daklib.lintian + tests
Chris Lamb [Sat, 31 Oct 2009 10:03:19 +0000 (10:03 +0000)]
Generate lintian reject messages in daklib.lintian + tests

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoAdd a docstring for parse_lintian_output
Chris Lamb [Sat, 31 Oct 2009 09:43:52 +0000 (09:43 +0000)]
Add a docstring for parse_lintian_output

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoAn empty output is handled fine.
Chris Lamb [Sat, 31 Oct 2009 09:43:16 +0000 (09:43 +0000)]
An empty output is handled fine.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoMove lintian parsing to daklib.lintian and add tests.
Chris Lamb [Sat, 31 Oct 2009 09:33:41 +0000 (09:33 +0000)]
Move lintian parsing to daklib.lintian and add tests.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoRename warning/error in lintian autorejects to nonfatal/fatal.
Chris Lamb [Sat, 31 Oct 2009 09:16:20 +0000 (09:16 +0000)]
Rename warning/error in lintian autorejects to nonfatal/fatal.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoMake all tests use DakTestCase.
Chris Lamb [Fri, 30 Oct 2009 23:50:43 +0000 (23:50 +0000)]
Make all tests use DakTestCase.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoAdd a base TestCase that we can extend later.
Chris Lamb [Fri, 30 Oct 2009 23:45:12 +0000 (23:45 +0000)]
Add a base TestCase that we can extend later.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoSimplify which_conf_file.s
Chris Lamb [Fri, 30 Oct 2009 23:43:51 +0000 (23:43 +0000)]
Simplify which_conf_file.s

15 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Sat, 31 Oct 2009 22:17:54 +0000 (23:17 +0100)]
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>
15 years agohmm...
Mark Hymers [Sat, 31 Oct 2009 21:55:39 +0000 (21:55 +0000)]
hmm...

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agofix name
Mark Hymers [Sat, 31 Oct 2009 21:54:08 +0000 (21:54 +0000)]
fix name

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoright variable name
Mark Hymers [Sat, 31 Oct 2009 21:48:31 +0000 (21:48 +0000)]
right variable name

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoI'm never tidying up names again
Mark Hymers [Sat, 31 Oct 2009 21:47:17 +0000 (21:47 +0000)]
I'm never tidying up names again

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agopoolfile, you moron
Mark Hymers [Sat, 31 Oct 2009 21:44:24 +0000 (21:44 +0000)]
poolfile, you moron

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoin_queue is the object, _id the id
Mark Hymers [Sat, 31 Oct 2009 21:41:33 +0000 (21:41 +0000)]
in_queue is the object, _id the id

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoqueue_id -> policy_queue_id
Mark Hymers [Sat, 31 Oct 2009 21:39:31 +0000 (21:39 +0000)]
queue_id -> policy_queue_id

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agofix variable name
Mark Hymers [Sat, 31 Oct 2009 21:36:55 +0000 (21:36 +0000)]
fix variable name

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoargh
Mark Hymers [Sat, 31 Oct 2009 21:35:22 +0000 (21:35 +0000)]
argh

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoWhen changing Queue -> Build/PolicyQueue, it helps to do a full job
Mark Hymers [Sat, 31 Oct 2009 21:34:06 +0000 (21:34 +0000)]
When changing Queue -> Build/PolicyQueue, it helps to do a full job

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoargh, another typo
Mark Hymers [Sat, 31 Oct 2009 21:30:29 +0000 (21:30 +0000)]
argh, another typo

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agotypo
Mark Hymers [Sat, 31 Oct 2009 21:29:03 +0000 (21:29 +0000)]
typo

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agowell spotted, djpig
Mark Hymers [Sat, 31 Oct 2009 21:18:42 +0000 (21:18 +0000)]
well spotted, djpig

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoFix up hand off to policy and buildd queues
Mark Hymers [Sat, 31 Oct 2009 21:09:04 +0000 (21:09 +0000)]
Fix up hand off to policy and buildd queues

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoMerge commit 'ftpmaster/master'
Mark Hymers [Sat, 31 Oct 2009 20:23:15 +0000 (20:23 +0000)]
Merge commit 'ftpmaster/master'

15 years agoMerge commit 'djpig/process-upload'
Mark Hymers [Sat, 31 Oct 2009 20:22:56 +0000 (20:22 +0000)]
Merge commit 'djpig/process-upload'

15 years agosort out permission columns
Mark Hymers [Sat, 31 Oct 2009 20:20:55 +0000 (20:20 +0000)]
sort out permission columns

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agodo not support multi-archive mode in process-upload
Frank Lichtenheld [Sat, 31 Oct 2009 20:20:52 +0000 (20:20 +0000)]
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>
15 years agocheck_files: Fix check for known changes files
Frank Lichtenheld [Sat, 31 Oct 2009 14:06:38 +0000 (14:06 +0000)]
check_files: Fix check for known changes files

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agoSmall fixes
Frank Lichtenheld [Sat, 31 Oct 2009 13:35:21 +0000 (13:35 +0000)]
Small fixes

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agoFix typo in foreign key constraint name
Frank Lichtenheld [Sat, 31 Oct 2009 13:16:37 +0000 (13:16 +0000)]
Fix typo in foreign key constraint name

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agoMerge commit 'mhy/master' into process-upload
Frank Lichtenheld [Sat, 31 Oct 2009 12:47:16 +0000 (12:47 +0000)]
Merge commit 'mhy/master' into process-upload

15 years agoinitial policy queue implementation in process_upload
Mark Hymers [Sat, 31 Oct 2009 12:41:34 +0000 (12:41 +0000)]
initial policy queue implementation in process_upload

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoMove one tag
Joerg Jaspert [Sat, 31 Oct 2009 11:15:21 +0000 (12:15 +0100)]
Move one tag

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agofix up existing changes file handling
Mark Hymers [Sat, 31 Oct 2009 11:02:55 +0000 (11:02 +0000)]
fix up existing changes file handling

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoMulti-valued changes fields are space-separated
Frank Lichtenheld [Sat, 31 Oct 2009 10:41:21 +0000 (10:41 +0000)]
Multi-valued changes fields are space-separated

Not comma-separated.

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agorename known_changes
Mark Hymers [Sat, 31 Oct 2009 09:44:09 +0000 (09:44 +0000)]
rename known_changes

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoMerge commit 'ftpmaster/master'
Mark Hymers [Sat, 31 Oct 2009 09:17:48 +0000 (09:17 +0000)]
Merge commit 'ftpmaster/master'

Conflicts:
daklib/dbconn.py

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoTry to sanitise changes and queue handling
Mark Hymers [Sat, 31 Oct 2009 09:16:47 +0000 (09:16 +0000)]
Try to sanitise changes and queue handling

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoStop talking about old and even older and yet older versions / vcs information
Joerg Jaspert [Sat, 31 Oct 2009 08:32:27 +0000 (09:32 +0100)]
Stop talking about old and even older and yet older versions / vcs information

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoremove some very old files
Joerg Jaspert [Sat, 31 Oct 2009 08:29:44 +0000 (09:29 +0100)]
remove some very old files

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoMerge commit 'djpig/djpig' into merge
Joerg Jaspert [Sat, 31 Oct 2009 08:22:02 +0000 (09:22 +0100)]
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>
15 years agoclean_queues: Log which queue we remove from
Frank Lichtenheld [Fri, 30 Oct 2009 23:29:14 +0000 (23:29 +0000)]
clean_queues: Log which queue we remove from

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agoMerge commit 'djpig/djpig' into merge
Joerg Jaspert [Fri, 30 Oct 2009 23:15:07 +0000 (00:15 +0100)]
Merge commit 'djpig/djpig' into merge

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

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoFix error in SQLA mapper setup
Frank Lichtenheld [Fri, 30 Oct 2009 22:54:12 +0000 (22:54 +0000)]
Fix error in SQLA mapper setup

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agoFix queue-report
Frank Lichtenheld [Fri, 30 Oct 2009 22:53:34 +0000 (22:53 +0000)]
Fix queue-report

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

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agoremove manpages, not much sense to have them, noone uses them
Joerg Jaspert [Fri, 30 Oct 2009 22:42:26 +0000 (23:42 +0100)]
remove manpages, not much sense to have them, noone uses them

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoremove a manpage. closes: 540170
Joerg Jaspert [Fri, 30 Oct 2009 22:41:29 +0000 (23:41 +0100)]
remove a manpage. closes: 540170

remove a manpage

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agorm
Joerg Jaspert [Fri, 30 Oct 2009 22:37:50 +0000 (23:37 +0100)]
rm

another rm.
closes: #540170

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoreadme
Joerg Jaspert [Fri, 30 Oct 2009 22:35:40 +0000 (23:35 +0100)]
readme

remove a pretty old documentation

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoupdate-db: General code cleanup
Frank Lichtenheld [Thu, 29 Oct 2009 12:56:46 +0000 (12:56 +0000)]
update-db: General code cleanup

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agoMerge commit 'djpig/process-upload'
Mark Hymers [Fri, 30 Oct 2009 22:26:30 +0000 (22:26 +0000)]
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>
15 years agocheck_files: check changes against known_changes
Frank Lichtenheld [Fri, 30 Oct 2009 22:20:35 +0000 (22:20 +0000)]
check_files: check changes against known_changes

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agoVarious fixes
Frank Lichtenheld [Fri, 30 Oct 2009 22:20:12 +0000 (22:20 +0000)]
Various fixes

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agochanges: fix known_changes handling of parsed changes files
Frank Lichtenheld [Fri, 30 Oct 2009 22:18:33 +0000 (22:18 +0000)]
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>
15 years agochanges: Remove .dak file handling
Frank Lichtenheld [Fri, 30 Oct 2009 22:17:57 +0000 (22:17 +0000)]
changes: Remove .dak file handling

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agodon't delete files in queue_files
Mark Hymers [Fri, 30 Oct 2009 22:17:23 +0000 (22:17 +0000)]
don't delete files in queue_files

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agocheck_dsc_against_db: fix a corner-case in .orig. handling
Frank Lichtenheld [Fri, 30 Oct 2009 22:12:50 +0000 (22:12 +0000)]
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>
15 years agoprocess-upload: try to use the same session all over the code
Frank Lichtenheld [Fri, 30 Oct 2009 22:11:21 +0000 (22:11 +0000)]
process-upload: try to use the same session all over the code

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agoFix various errors caused by moving stuff around
Frank Lichtenheld [Fri, 30 Oct 2009 22:10:10 +0000 (22:10 +0000)]
Fix various errors caused by moving stuff around

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agoprocess-upload: make sure we clean up after ourself
Frank Lichtenheld [Fri, 30 Oct 2009 22:06:29 +0000 (22:06 +0000)]
process-upload: make sure we clean up after ourself

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agochanges: Use @session_wrapper
Frank Lichtenheld [Fri, 30 Oct 2009 22:02:47 +0000 (22:02 +0000)]
changes: Use @session_wrapper

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Fri, 30 Oct 2009 21:50:06 +0000 (22:50 +0100)]
Merge commit 'mhy/master' into merge

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

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoadd changes and queue handling
Mark Hymers [Fri, 30 Oct 2009 21:42:05 +0000 (21:42 +0000)]
add changes and queue handling

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agosig verify
Joerg Jaspert [Fri, 30 Oct 2009 19:52:06 +0000 (20:52 +0100)]
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>
15 years agoqueue: Add missing SQLA import
Frank Lichtenheld [Fri, 30 Oct 2009 16:59:42 +0000 (16:59 +0000)]
queue: Add missing SQLA import

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agoFix typo in function name
Frank Lichtenheld [Fri, 30 Oct 2009 16:56:03 +0000 (16:56 +0000)]
Fix typo in function name

check_dm_source_upload -> check_dm_upload

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agoMerge process-accepted's install into Upload.install()
Frank Lichtenheld [Fri, 30 Oct 2009 16:37:52 +0000 (16:37 +0000)]
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>
15 years agoUpload: remove cruft
Frank Lichtenheld [Fri, 30 Oct 2009 16:34:14 +0000 (16:34 +0000)]
Upload: remove cruft

* Remove unused reprocess member
* Remove CopyDotDak support

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agoMove helper functions for database insertion to dbconn
Frank Lichtenheld [Fri, 30 Oct 2009 16:30:05 +0000 (16:30 +0000)]
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>
15 years agoMerge commit 'private/master' into process-upload
Frank Lichtenheld [Fri, 30 Oct 2009 15:16:40 +0000 (15:16 +0000)]
Merge commit 'private/master' into process-upload

15 years agoMerge commit 'stew/knownchanges' into merge
Joerg Jaspert [Fri, 30 Oct 2009 14:40:08 +0000 (15:40 +0100)]
Merge commit 'stew/knownchanges' into merge

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

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agosplit read and write locks
Mike O'Connor [Fri, 30 Oct 2009 14:38:18 +0000 (15:38 +0100)]
split read and write locks

Signed-off-by: Mike O'Connor <stew@vireo.org>
15 years agoMerge commit 'lamby/master' into merge
Joerg Jaspert [Fri, 30 Oct 2009 14:32:17 +0000 (15:32 +0100)]
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>
15 years ago'as' is a reserved word in Python 2.6.
Chris Lamb [Fri, 30 Oct 2009 14:28:33 +0000 (14:28 +0000)]
'as' is a reserved word in Python 2.6.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoDon't shadow 'file' builtin in daklib.queue.
Chris Lamb [Fri, 30 Oct 2009 14:11:05 +0000 (14:11 +0000)]
Don't shadow 'file' builtin in daklib.queue.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoUse 4 spaces for indentation.
Chris Lamb [Fri, 30 Oct 2009 14:08:27 +0000 (14:08 +0000)]
Use 4 spaces for indentation.

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