Merge branch 'merge'

* merge:
  clean-suites: Remove trailing whitespace
  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

diff --git a/daklib/changes.py b/daklib/changes.py
index 59c7da17d15da775e7a3e4d843f4f643e3894210..ff23222486a220a3fd8d316836b01c51ff5db55a 100755 (executable)
--- a/daklib/changes.py
+++ b/daklib/changes.py
@@ -191,8 +191,8 @@ class Changes(object):
         self.dsc_files.update(p.load())
 
         next_obj = p.load()
-        if type(next_obj) is DictType:
-            self.pkg.orig_files.update(next_obj)
+        if isinstance(next_obj, dict):
+            self.orig_files.update(next_obj)
         else:
             # Auto-convert old dak files to new format supporting
             # multiple tarballs

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index adecc38a7f060d6c9876be399e6d6b4df3fb3034..abf0607441d634eeceb8601422e9c4a82dc7ff0b 100755 (executable)
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -84,6 +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
 

diff --git a/daklib/queue.py b/daklib/queue.py
index d70e60b190d35195434ca031e50435f10c8c0ff7..daaa3c6e03936f6364e2cd851602dd946dad2dcd 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -72,7 +72,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: