From: Joerg Jaspert <joerg@debian.org>
Date: Mon, 26 Oct 2009 12:57:21 +0000 (+0100)
Subject: Merge commit 'mhy/sqlalchemy' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=0dada7c5846e0ae676bbe0b81c1065fe75ca9b86;hp=-c;p=dak.git

Merge commit 'mhy/sqlalchemy' into merge

* commit 'mhy/sqlalchemy': (135 commits)
  pass session to get_id
  NULL is None, not ""
  fix bad merge in 1c35448b880358d020e81339657e3435fdda9434
  typo fixes
  clean up holding path
  only look in queues which exist
  handle bad checksum lines
  misc fixes
  fix typo
  fix typo
  attempt to ensure we clear up sessions
  make sure we close sessions
  miscellaneous fixups from testing
  convert check_overrides to new DB API
  convert override.py to new DB API
  convert (badly) rm to new DB API
  convert ls to new DB API
  bug fix
  convert import_keyring to new DB API
  convert cruft_report to new DB API
  ...

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

0dada7c5846e0ae676bbe0b81c1065fe75ca9b86
diff --combined dak/dak.py
index db2d3cf1,c8a6a198..10407b50
--- a/dak/dak.py
+++ b/dak/dak.py
@@@ -131,6 -131,8 +131,6 @@@ def init()
           "Override cruft checks"),
          ("check-proposed-updates",
           "Dependency checking for proposed-updates"),
 -        ("compare-suites",
 -         "Show fixable discrepencies between suites"),
          ("control-overrides",
           "Manipulate/list override entries in bulk"),
          ("control-suite",
@@@ -143,12 -145,16 +143,14 @@@
           "Show information useful for NEW processing"),
          ("find-null-maintainers",
           "Check for users with no packages in the archive"),
 -        ("import-archive",
 -         "Populate SQL database based from an archive tree"),
          ("import-keyring",
           "Populate fingerprint/uid table based on a new/updated keyring"),
          ("import-ldap-fingerprints",
           "Syncs fingerprint and uid tables with Debian LDAP db"),
          ("import-users-from-passwd",
           "Sync PostgreSQL users with passwd file"),
+         ("admin",
+          "Perform administration on the dak database"),
          ("init-db",
           "Update the database to match the conf file"),
          ("update-db",
@@@ -161,6 -167,8 +163,6 @@@
           "Generates override files"),
          ("poolize",
           "Move packages from dists/ to pool/"),
 -        ("reject-proposed-updates",
 -         "Manually reject from proposed-updates"),
          ("new-security-install",
           "New way to install a security upload into the archive"),
          ("split-done",