Adjust the regexes used for DEP-11 files

[dak.git] / daklib / archive.py

diff --git a/daklib/archive.py b/daklib/archive.py
index fa67f10e2f2ff64f69cf48e0e7257a8af6a8b019..4226ce9c6e11eb6ebf3761c65fd07783e9a14efc 100644 (file)
--- a/daklib/archive.py
+++ b/daklib/archive.py
@@ -274,7 +274,6 @@ class ArchiveTransaction(object):
             )
         rest = dict(
             maintainer=maintainer,
-            #install_date=datetime.now().date(),
             poolfile=db_file_dsc,
             dm_upload_allowed=(control.get('DM-Upload-Allowed', 'no') == 'yes'),
             )
@@ -298,8 +297,6 @@ class ArchiveTransaction(object):
                 setattr(db_source, key, value)
             for key, value in rest2.iteritems():
                 setattr(db_source, key, value)
-            # XXX: set as default in postgres?
-            db_source.install_date = datetime.now().date()
             session.add(db_source)
             session.flush()
 
@@ -1039,7 +1036,7 @@ class ArchiveUpload(object):
         db_binaries = []
         for binary in self.changes.binaries:
             copy_to_suite = suite
-            if binary.is_debug() and suite.debug_suite is not None:
+            if utils.is_in_debug_section(binary.control) and suite.debug_suite is not None:
                 copy_to_suite = suite.debug_suite
 
             component = binary_component_func(binary)
@@ -1173,7 +1170,7 @@ class ArchiveUpload(object):
                 continue
 
             script = rule['Script']
-            retcode = daklib.daksubprocess.call([script, os.path.join(self.directory, f.filename), control['Version'], arch, os.path.join(self.directory, self.changes.filename)], shell=False)
+            retcode = daklib.daksubprocess.call([script, os.path.join(self.directory, f.filename), control['Version'], arch, os.path.join(self.directory, self.changes.filename), suite.suite_name], shell=False)
             if retcode != 0:
                 print "W: error processing {0}.".format(f.filename)
                 remaining.append(f)