Merge branch 'merge'

* merge:
  Disable check_lintian for now.
  Only lintian reject uploads to unstable or experimental
  Fix use of "wayout" name.
  dict[k] raises IndexError if does not exist - check with infix 'in' instead.
  Actually add a seperator to our --tags-from-file input.
  lintian YAML has a "lintian" root element.
  Close sourcefile.
  Dedent again by returning if lintian doesn't return any content.
  Return all the lintian-related rejections, not just the first one.
  It's called 'next', not 'continue'. =)
  Dedent again by using continue.
  Remove one level of indentation by using continue
  Simple check for lintian regex
  Use set() instead of Perlesque hash[key] = 1
  autoreject
  Add lintian tags file

diff --git a/dak/rm.py b/dak/rm.py
index fe763605f545ddff7748a2a7dad6d7071ebc44ab..5140019454bd268e2f09f85e97733b920639b796 100755 (executable)
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -505,8 +505,8 @@ def main ():
     logfile.write("----------------------------------------------\n")
     logfile.flush()
 
-    dsc_type_id = get_override_type('dsc', session)
-    deb_type_id = get_override_type('deb', session)
+    dsc_type_id = get_override_type('dsc', session).overridetype_id
+    deb_type_id = get_override_type('deb', session).overridetype_id
 
     # Do the actual deletion
     print "Deleting...",

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..850c10d8d0bffcfae4cc9fc87fc6462ff7225869 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
 
@@ -1417,6 +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 --git a/daklib/queue.py b/daklib/queue.py
index 25b407232f602575e9ee9eeb26660b7fea56c653..b3247ee1924c1f8188bfae42105eb77387efb41c 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -73,7 +73,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:
@@ -1000,11 +1000,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)