From: Chris Lamb <lamby@debian.org>
Date: Tue, 27 Oct 2009 20:37:50 +0000 (+0000)
Subject: Merge branch 'master' of ries.debian.org:/srv/ftp.debian.org/git/dak
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=97ac37bc77ac3e894ffd4097a277998ddb5e88e4;hp=-c;p=dak.git

Merge branch 'master' of ries.debian.org:/srv/ftp.debian.org/git/dak

* 'master' of ries.debian.org:/srv/ftp.debian.org/git/dak:
  let's not reset last_used every time...
  old
  use the id, not the object
  add regex import
  clean-suites: Remove trailing whitespace
  file -> f
  we're already in the changes object
  use isinstance
  fixup
  clean-suites: Fix logic error in during source cleaning
  clean-suites: Fix SQLA usage
  Fix SQL syntax errors
  clean-suites: Use utils.warn for warnings about orphaned files
  clean-suites: Add proper logging
  daklog: Add username in every log line
---

97ac37bc77ac3e894ffd4097a277998ddb5e88e4
diff --combined daklib/dbconn.py
index 224935dd,850c10d8..56ff65aa
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@@ -39,7 -39,7 +39,7 @@@ import tracebac
  
  from inspect import getargspec
  
 -from sqlalchemy import create_engine, Table, MetaData, select
 +from sqlalchemy import create_engine, Table, MetaData
  from sqlalchemy.orm import sessionmaker, mapper, relation
  
  # Don't remove this, we re-export the exceptions to scripts which import us
@@@ -84,6 -84,7 +84,7 @@@ def session_wrapper(fn)
                  # Session is last argument in args
                  session = args[-1]
                  if session is None:
+                     args = list(args)
                      session = args[-1] = DBConn().session()
                      private_transaction = True
  
@@@ -1417,6 -1418,7 +1418,7 @@@ class Queue(object)
              # them (if one doesn't already exist)
              for dsc_file in changes.dsc_files.keys():
                  # Skip all files except orig tarballs
+                 from daklib.regexes import re_is_orig_source
                  if not re_is_orig_source.match(dsc_file):
                      continue
                  # Skip orig files not identified in the pool
diff --combined daklib/queue.py
index 1ece0d1d,9540ee16..8bb06307
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@@ -26,6 -26,7 +26,6 @@@ Queue utility functions for da
  
  ###############################################################################
  
 -import cPickle
  import errno
  import os
  import pg
@@@ -71,7 -72,7 +71,7 @@@ def get_type(f, session)
      """
      # Determine the type
      if f.has_key("dbtype"):
-         file_type = file["dbtype"]
+         file_type = f["dbtype"]
      elif re_source_ext.match(f["type"]):
          file_type = "dsc"
      else:
@@@ -998,11 -999,6 +998,6 @@@ class Upload(object)
          for field_name in [ "build-depends", "build-depends-indep" ]:
              field = self.pkg.dsc.get(field_name)
              if field:
-                 # Check for broken dpkg-dev lossage...
-                 if field.startswith("ARRAY"):
-                     self.rejects.append("%s: invalid %s field produced by a broken version of dpkg-dev (1.10.11)" % \
-                                         (dsc_filename, field_name.title()))
- 
                  # Have apt try to parse them...
                  try:
                      apt_pkg.ParseSrcDepends(field)