]> git.decadent.org.uk Git - dak.git/log
dak.git
14 years agoclean-suites: Fix SQLA usage
Frank Lichtenheld [Tue, 27 Oct 2009 14:37:23 +0000 (14:37 +0000)]
clean-suites: Fix SQLA usage

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
14 years agoFix SQL syntax errors
Frank Lichtenheld [Tue, 27 Oct 2009 14:28:04 +0000 (14:28 +0000)]
Fix SQL syntax errors

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
14 years agoclean-suites: Use utils.warn for warnings about orphaned files
Frank Lichtenheld [Tue, 27 Oct 2009 14:27:30 +0000 (14:27 +0000)]
clean-suites: Use utils.warn for warnings about orphaned files

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
14 years agoclean-suites: Add proper logging
Frank Lichtenheld [Tue, 27 Oct 2009 14:06:21 +0000 (14:06 +0000)]
clean-suites: Add proper logging

Also move some SQL queries to ORM API where useful and/or easy.

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
14 years agodaklog: Add username in every log line
Frank Lichtenheld [Tue, 27 Oct 2009 14:05:09 +0000 (14:05 +0000)]
daklog: Add username in every log line

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Tue, 27 Oct 2009 10:05:04 +0000 (11:05 +0100)]
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  process-new: Fix BCC and X-Katie handling
  Fix various small bugs
  Re-enable BXA notifications
  queue: Fix typo
  Convert process_new to new APIs
  Print a warning if a trainee tries to do something he's not allowed to do
  Documentation fixes

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoMerge commit 'djpig/djpig'
Mark Hymers [Tue, 27 Oct 2009 10:04:35 +0000 (10:04 +0000)]
Merge commit 'djpig/djpig'

Conflicts:
daklib/dbconn.py

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoprocess-new: Fix BCC and X-Katie handling
Frank Lichtenheld [Tue, 27 Oct 2009 09:57:05 +0000 (09:57 +0000)]
process-new: Fix BCC and X-Katie handling

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
14 years agoFix various small bugs
Frank Lichtenheld [Tue, 27 Oct 2009 09:56:06 +0000 (09:56 +0000)]
Fix various small bugs

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Tue, 27 Oct 2009 09:05:51 +0000 (10:05 +0100)]
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  fix p-u accepts for binary uploads

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agofix p-u accepts for binary uploads
Mark Hymers [Tue, 27 Oct 2009 09:04:57 +0000 (09:04 +0000)]
fix p-u accepts for binary uploads

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'lamby/master' into merge
Joerg Jaspert [Tue, 27 Oct 2009 08:49:04 +0000 (09:49 +0100)]
Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Correct logic with detecting default kwarg values vs positional args.
  Wrap __doc__ and func_name in @session_wrapper.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoCorrect logic with detecting default kwarg values vs positional args.
Chris Lamb [Tue, 27 Oct 2009 08:47:48 +0000 (08:47 +0000)]
Correct logic with detecting default kwarg values vs positional args.

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agoWrap __doc__ and func_name in @session_wrapper.
Chris Lamb [Tue, 27 Oct 2009 08:40:04 +0000 (08:40 +0000)]
Wrap __doc__ and func_name in @session_wrapper.

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agoMerge commit 'lamby/master' into merge
Joerg Jaspert [Tue, 27 Oct 2009 08:36:02 +0000 (09:36 +0100)]
Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Avoid circular import when importing daklib.dbconn first.
  Handle arguments with default kwargs in @session_wrapper.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoAvoid circular import when importing daklib.dbconn first.
Chris Lamb [Tue, 27 Oct 2009 08:35:14 +0000 (08:35 +0000)]
Avoid circular import when importing daklib.dbconn first.

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agoHandle arguments with default kwargs in @session_wrapper.
Chris Lamb [Tue, 27 Oct 2009 08:34:25 +0000 (08:34 +0000)]
Handle arguments with default kwargs in @session_wrapper.

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agoMerge commit 'lamby/master' into merge
Joerg Jaspert [Tue, 27 Oct 2009 08:28:50 +0000 (09:28 +0100)]
Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Add missing "utils" import (used in security conditional)
  No need to assign to a local now that @session_wrapper does the cleanup
  Avoid calling .count(); call .one() and catch the exception.
  Fix Archive.__repr__
  Factor out most common session handling into decorator.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoAdd missing "utils" import (used in security conditional)
Chris Lamb [Tue, 27 Oct 2009 08:18:57 +0000 (08:18 +0000)]
Add missing "utils" import (used in security conditional)

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agoNo need to assign to a local now that @session_wrapper does the cleanup
Chris Lamb [Mon, 26 Oct 2009 20:02:09 +0000 (20:02 +0000)]
No need to assign to a local now that @session_wrapper does the cleanup

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agoAvoid calling .count(); call .one() and catch the exception.
Chris Lamb [Mon, 26 Oct 2009 19:48:14 +0000 (19:48 +0000)]
Avoid calling .count(); call .one() and catch the exception.

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agoRe-enable BXA notifications
Frank Lichtenheld [Mon, 26 Oct 2009 19:43:22 +0000 (19:43 +0000)]
Re-enable BXA notifications

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
14 years agoqueue: Fix typo
Frank Lichtenheld [Mon, 26 Oct 2009 19:42:33 +0000 (19:42 +0000)]
queue: Fix typo

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
14 years agoFix Archive.__repr__
Chris Lamb [Mon, 26 Oct 2009 19:27:09 +0000 (19:27 +0000)]
Fix Archive.__repr__

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agoFactor out most common session handling into decorator.
Chris Lamb [Mon, 26 Oct 2009 19:25:33 +0000 (19:25 +0000)]
Factor out most common session handling into decorator.

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agoConvert process_new to new APIs
Frank Lichtenheld [Mon, 26 Oct 2009 19:19:27 +0000 (19:19 +0000)]
Convert process_new to new APIs

All code only used in security and/or stable updates is commented
out for now and not converted, yet

14 years agoPrint a warning if a trainee tries to do something he's not allowed to do
Frank Lichtenheld [Mon, 26 Oct 2009 19:16:43 +0000 (19:16 +0000)]
Print a warning if a trainee tries to do something he's not allowed to do

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
14 years agoDocumentation fixes
Frank Lichtenheld [Mon, 26 Oct 2009 13:50:32 +0000 (13:50 +0000)]
Documentation fixes

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 19:11:03 +0000 (20:11 +0100)]
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  really disable contents in p-a

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoreally disable contents in p-a
Mark Hymers [Mon, 26 Oct 2009 19:10:50 +0000 (19:10 +0000)]
really disable contents in p-a

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 19:06:06 +0000 (20:06 +0100)]
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  disable contents storage for now

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agodisable contents storage for now
Mark Hymers [Mon, 26 Oct 2009 19:05:43 +0000 (19:05 +0000)]
disable contents storage for now

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 18:21:07 +0000 (19:21 +0100)]
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  Dear Ganneff, C+P coding is not helpful

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoDear Ganneff, C+P coding is not helpful
Mark Hymers [Mon, 26 Oct 2009 18:20:43 +0000 (18:20 +0000)]
Dear Ganneff, C+P coding is not helpful

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 18:18:46 +0000 (19:18 +0100)]
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  try fixing up this *again*

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoFor now do not say queue only but let it deliver instantly
Joerg Jaspert [Mon, 26 Oct 2009 18:17:04 +0000 (19:17 +0100)]
For now do not say queue only but let it deliver instantly

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agotry fixing up this *again*
Mark Hymers [Mon, 26 Oct 2009 18:15:21 +0000 (18:15 +0000)]
try fixing up this *again*

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 18:10:03 +0000 (19:10 +0100)]
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  why do people want readable messages?

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agowhy do people want readable messages?
Mark Hymers [Mon, 26 Oct 2009 18:09:50 +0000 (18:09 +0000)]
why do people want readable messages?

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 18:07:32 +0000 (19:07 +0100)]
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  urgh, wrong part of the message

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agourgh, wrong part of the message
Mark Hymers [Mon, 26 Oct 2009 18:06:46 +0000 (18:06 +0000)]
urgh, wrong part of the message

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 18:03:33 +0000 (19:03 +0100)]
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  tidy up messages

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agotidy up messages
Mark Hymers [Mon, 26 Oct 2009 18:03:10 +0000 (18:03 +0000)]
tidy up messages

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 18:00:49 +0000 (19:00 +0100)]
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  package -> source

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agopackage -> source
Mark Hymers [Mon, 26 Oct 2009 18:00:37 +0000 (18:00 +0000)]
package -> source

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 17:59:32 +0000 (18:59 +0100)]
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  show the package name, not the object repr

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoshow the package name, not the object repr
Mark Hymers [Mon, 26 Oct 2009 17:59:15 +0000 (17:59 +0000)]
show the package name, not the object repr

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 17:57:47 +0000 (18:57 +0100)]
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  we now get an object or None back not a list...

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agowe now get an object or None back not a list...
Mark Hymers [Mon, 26 Oct 2009 17:56:42 +0000 (17:56 +0000)]
we now get an object or None back not a list...

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 17:54:00 +0000 (18:54 +0100)]
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  use correct function name

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agouse correct function name
Mark Hymers [Mon, 26 Oct 2009 17:46:55 +0000 (17:46 +0000)]
use correct function name

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 16:55:22 +0000 (17:55 +0100)]
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  initialise template variables

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoinitialise template variables
Mark Hymers [Mon, 26 Oct 2009 16:54:40 +0000 (16:54 +0000)]
initialise template variables

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'lamby/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 16:39:29 +0000 (17:39 +0100)]
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>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 16:38:56 +0000 (17:38 +0100)]
Merge commit 'mhy/master' into merge

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

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agothe database is faster than us now
Mark Hymers [Mon, 26 Oct 2009 16:38:39 +0000 (16:38 +0000)]
the database is faster than us now

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoDon't repr the object; could be a long (and ends up with eg. "2L")
Chris Lamb [Mon, 26 Oct 2009 16:30:41 +0000 (16:30 +0000)]
Don't repr the object; could be a long (and ends up with eg. "2L")

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 16:25:00 +0000 (17:25 +0100)]
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>
14 years agomake cruft_report report
Mark Hymers [Mon, 26 Oct 2009 16:24:46 +0000 (16:24 +0000)]
make cruft_report report

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'lamby/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 15:24:51 +0000 (16:24 +0100)]
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>
14 years agoUse the correct dictionary to lookup name of users.
Chris Lamb [Mon, 26 Oct 2009 15:23:56 +0000 (15:23 +0000)]
Use the correct dictionary to lookup name of users.

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agowhoops - call it with the object, not the name
Mark Hymers [Mon, 26 Oct 2009 15:20:55 +0000 (15:20 +0000)]
whoops - call it with the object, not the name

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agocall get_suite_binaries properly
Mark Hymers [Mon, 26 Oct 2009 15:20:06 +0000 (15:20 +0000)]
call get_suite_binaries properly

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agopass parameters properly
Mark Hymers [Mon, 26 Oct 2009 15:18:25 +0000 (15:18 +0000)]
pass parameters properly

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 15:12:48 +0000 (16:12 +0100)]
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>
14 years agoimport a class we need and don't hide errors
Mark Hymers [Mon, 26 Oct 2009 15:12:26 +0000 (15:12 +0000)]
import a class we need and don't hide errors

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 15:03:55 +0000 (16:03 +0100)]
Merge commit 'mhy/master' into merge

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

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agohack around file hanging around forever
Mark Hymers [Mon, 26 Oct 2009 15:03:27 +0000 (15:03 +0000)]
hack around file hanging around forever

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'lamby/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 15:03:17 +0000 (16:03 +0100)]
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>
14 years agoRevert "Use gzip.open(.., 'rb')" as this version of python-apt is olde
Chris Lamb [Mon, 26 Oct 2009 14:54:42 +0000 (14:54 +0000)]
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>
14 years agoFind/replace fail.
Chris Lamb [Mon, 26 Oct 2009 14:52:42 +0000 (14:52 +0000)]
Find/replace fail.

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 14:51:46 +0000 (15:51 +0100)]
Merge commit 'mhy/master' into merge

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

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agofix handling of suite names
Mark Hymers [Mon, 26 Oct 2009 14:50:29 +0000 (14:50 +0000)]
fix handling of suite names

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'lamby/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 14:49:24 +0000 (15:49 +0100)]
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>
14 years agoMake import_keyring use dbconn.get_or_set_uid.
Chris Lamb [Mon, 26 Oct 2009 14:48:15 +0000 (14:48 +0000)]
Make import_keyring use dbconn.get_or_set_uid.

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agoMake import_keyring use get_or_set_keyring.
Chris Lamb [Mon, 26 Oct 2009 14:46:13 +0000 (14:46 +0000)]
Make import_keyring use get_or_set_keyring.

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agoPort database.get_or_set_keyring_id => dbconn.get_or_set_keyring
Chris Lamb [Mon, 26 Oct 2009 14:45:55 +0000 (14:45 +0000)]
Port database.get_or_set_keyring_id => dbconn.get_or_set_keyring

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agoUse gzip.open(.., 'rb') instead of gunzip and temporary filenames.
Chris Lamb [Mon, 26 Oct 2009 14:27:03 +0000 (14:27 +0000)]
Use gzip.open(.., 'rb') instead of gunzip and temporary filenames.

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 14:47:49 +0000 (15:47 +0100)]
Merge commit 'mhy/master' into merge

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

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agouse the right variable names
Mark Hymers [Mon, 26 Oct 2009 14:47:15 +0000 (14:47 +0000)]
use the right variable names

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 14:43:45 +0000 (15:43 +0100)]
Merge commit 'mhy/master' into merge

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

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoimport a function which we use
Mark Hymers [Mon, 26 Oct 2009 14:43:24 +0000 (14:43 +0000)]
import a function which we use

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 14:42:26 +0000 (15:42 +0100)]
Merge commit 'mhy/master' into merge

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

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoand again...
Mark Hymers [Mon, 26 Oct 2009 14:42:15 +0000 (14:42 +0000)]
and again...

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 14:41:12 +0000 (15:41 +0100)]
Merge commit 'mhy/master' into merge

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

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agouse the right variable name
Mark Hymers [Mon, 26 Oct 2009 14:40:38 +0000 (14:40 +0000)]
use the right variable name

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 14:25:11 +0000 (15:25 +0100)]
Merge commit 'mhy/master' into merge

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

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agopass session down to delete_packages
Mark Hymers [Mon, 26 Oct 2009 14:24:24 +0000 (14:24 +0000)]
pass session down to delete_packages

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'lamby/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 14:16:04 +0000 (15:16 +0100)]
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>
14 years agoget_suite_architectures returns [Architecture] now, not [str]
Chris Lamb [Mon, 26 Oct 2009 14:12:36 +0000 (14:12 +0000)]
get_suite_architectures returns [Architecture] now, not [str]

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agoMerge commit 'lamby/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 14:07:21 +0000 (15:07 +0100)]
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>
14 years agoAlter get_maintainer API to return Maintainer object or None
Chris Lamb [Mon, 26 Oct 2009 14:04:51 +0000 (14:04 +0000)]
Alter get_maintainer API to return Maintainer object or None

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agoFix get_maintainer
Chris Lamb [Mon, 26 Oct 2009 13:56:48 +0000 (13:56 +0000)]
Fix get_maintainer

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agoMerge commit 'lamby/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 13:54:59 +0000 (14:54 +0100)]
Merge commit 'lamby/master' into merge

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

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoPort get_maintainer to dbconn.
Chris Lamb [Mon, 26 Oct 2009 13:54:02 +0000 (13:54 +0000)]
Port get_maintainer to dbconn.

Signed-off-by: Chris Lamb <lamby@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 13:39:23 +0000 (14:39 +0100)]
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  another merge failure

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoanother merge failure
Mark Hymers [Mon, 26 Oct 2009 13:38:15 +0000 (13:38 +0000)]
another merge failure

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 13:34:18 +0000 (14:34 +0100)]
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  fix bad merge

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agofix bad merge
Mark Hymers [Mon, 26 Oct 2009 13:34:03 +0000 (13:34 +0000)]
fix bad merge

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Mon, 26 Oct 2009 13:32:01 +0000 (14:32 +0100)]
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>